From ae64c5062e00a2af80f0cceef44599ab8dc77053 Mon Sep 17 00:00:00 2001 From: Martin Dub Date: Wed, 15 Nov 2023 13:42:58 +0100 Subject: [PATCH 1/7] Dynamic properties --- src/Auth/Passwords/TokenRepository.php | 1 + src/CP/Columns.php | 1 + src/Console/Commands/GeneratorCommand.php | 1 + src/Extend/Manifest.php | 2 ++ src/Fieldtypes/Entries.php | 1 + src/Fieldtypes/Sets.php | 1 - src/GraphQL/Types/AssetType.php | 1 + src/GraphQL/Types/EntryType.php | 1 + src/GraphQL/Types/GlobalSetType.php | 1 + src/GraphQL/Types/GridItemType.php | 1 + src/GraphQL/Types/NavBasicPageType.php | 1 + src/GraphQL/Types/NavEntryPageType.php | 1 + src/GraphQL/Types/NavPageInterface.php | 1 + src/GraphQL/Types/ReplicatorSetType.php | 1 + src/GraphQL/Types/ReplicatorSetsType.php | 1 + src/GraphQL/Types/TermType.php | 1 + src/GraphQL/Types/TreeBranchType.php | 2 ++ src/Http/Resources/CP/Entries/Entries.php | 1 + src/Http/Resources/CP/Submissions/Submissions.php | 1 + src/Http/Resources/CP/Taxonomies/Terms.php | 1 + src/Ignition/SolutionProviders/UsingOldClass.php | 1 + src/View/Antlers/Language/Parser/DocumentParser.php | 4 ++-- .../Debugbar/AntlersProfiler/PerformanceTracer.php | 10 +++++----- tests/Stache/FeatureTest.php | 1 - .../Repositories/GlobalVariablesRepositoryTest.php | 1 + tests/Support/Concerns/TestsIlluminateStr.php | 1 - 26 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/Auth/Passwords/TokenRepository.php b/src/Auth/Passwords/TokenRepository.php index 9b226c8b5f..236310c54d 100644 --- a/src/Auth/Passwords/TokenRepository.php +++ b/src/Auth/Passwords/TokenRepository.php @@ -15,6 +15,7 @@ class TokenRepository extends DatabaseTokenRepository protected $hasher; protected $hashKey; protected $expires; + protected $throttle; protected $path; public function __construct(Filesystem $files, HasherContract $hasher, $table, $hashKey, $expires = 60, $throttle = 60) diff --git a/src/CP/Columns.php b/src/CP/Columns.php index a07e92228d..4bef6638b1 100644 --- a/src/CP/Columns.php +++ b/src/CP/Columns.php @@ -7,6 +7,7 @@ class Columns extends Collection { + private $items; /** * Ensure has column. * diff --git a/src/Console/Commands/GeneratorCommand.php b/src/Console/Commands/GeneratorCommand.php index b2e2fe2f5a..9de87901c9 100644 --- a/src/Console/Commands/GeneratorCommand.php +++ b/src/Console/Commands/GeneratorCommand.php @@ -13,6 +13,7 @@ abstract class GeneratorCommand extends IlluminateGeneratorCommand { protected $package; + protected $shownAddonPathError; /** * Execute the console command. diff --git a/src/Extend/Manifest.php b/src/Extend/Manifest.php index b038b02637..1f3978dc49 100644 --- a/src/Extend/Manifest.php +++ b/src/Extend/Manifest.php @@ -11,6 +11,8 @@ class Manifest extends PackageManifest { + protected $manifest; + public function build() { $this->manifest = null; diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php index 13786461ef..f29272c518 100644 --- a/src/Fieldtypes/Entries.php +++ b/src/Fieldtypes/Entries.php @@ -34,6 +34,7 @@ class Entries extends Relationship protected $canSearch = true; protected $statusIcons = true; protected $formComponent = 'entry-publish-form'; + protected $activeFilterBadges; protected $formComponentProps = [ 'initialActions' => 'actions', diff --git a/src/Fieldtypes/Sets.php b/src/Fieldtypes/Sets.php index bac456f7f6..94e6c9a61a 100644 --- a/src/Fieldtypes/Sets.php +++ b/src/Fieldtypes/Sets.php @@ -2,7 +2,6 @@ namespace Statamic\Fieldtypes; -use Statamic\Fields\Fieldset; use Statamic\Fields\FieldTransformer; use Statamic\Fields\Fieldtype; use Statamic\Support\Arr; diff --git a/src/GraphQL/Types/AssetType.php b/src/GraphQL/Types/AssetType.php index 7f307367d7..0a7a140b52 100644 --- a/src/GraphQL/Types/AssetType.php +++ b/src/GraphQL/Types/AssetType.php @@ -11,6 +11,7 @@ class AssetType extends \Rebing\GraphQL\Support\Type { private $container; private $blueprint; + private array $attributes; public function __construct($container) { diff --git a/src/GraphQL/Types/EntryType.php b/src/GraphQL/Types/EntryType.php index 97cefe0e08..62139352be 100644 --- a/src/GraphQL/Types/EntryType.php +++ b/src/GraphQL/Types/EntryType.php @@ -12,6 +12,7 @@ class EntryType extends \Rebing\GraphQL\Support\Type { protected $collection; protected $blueprint; + protected $attributes; public function __construct($collection, $blueprint) { diff --git a/src/GraphQL/Types/GlobalSetType.php b/src/GraphQL/Types/GlobalSetType.php index 92212501a1..438fe16709 100644 --- a/src/GraphQL/Types/GlobalSetType.php +++ b/src/GraphQL/Types/GlobalSetType.php @@ -9,6 +9,7 @@ class GlobalSetType extends \Rebing\GraphQL\Support\Type { private $globals; + private $attributes; public function __construct($globals) { diff --git a/src/GraphQL/Types/GridItemType.php b/src/GraphQL/Types/GridItemType.php index 9648cd4fc4..94365d680c 100644 --- a/src/GraphQL/Types/GridItemType.php +++ b/src/GraphQL/Types/GridItemType.php @@ -8,6 +8,7 @@ class GridItemType extends Type { protected $fieldtype; + protected $attributes; public function __construct($fieldtype, $name) { diff --git a/src/GraphQL/Types/NavBasicPageType.php b/src/GraphQL/Types/NavBasicPageType.php index 3cb6f2ea8f..f4c3cad8cc 100644 --- a/src/GraphQL/Types/NavBasicPageType.php +++ b/src/GraphQL/Types/NavBasicPageType.php @@ -10,6 +10,7 @@ class NavBasicPageType extends \Rebing\GraphQL\Support\Type { protected $nav; + protected $attributes; public function __construct($nav) { diff --git a/src/GraphQL/Types/NavEntryPageType.php b/src/GraphQL/Types/NavEntryPageType.php index 7e386c7c9b..ef2ceabeb8 100644 --- a/src/GraphQL/Types/NavEntryPageType.php +++ b/src/GraphQL/Types/NavEntryPageType.php @@ -14,6 +14,7 @@ class NavEntryPageType extends \Rebing\GraphQL\Support\Type protected $nav; protected $collection; protected $blueprint; + protected $attributes; public function __construct($nav, $collection, $blueprint) { diff --git a/src/GraphQL/Types/NavPageInterface.php b/src/GraphQL/Types/NavPageInterface.php index f464713edd..e6c6ce6974 100644 --- a/src/GraphQL/Types/NavPageInterface.php +++ b/src/GraphQL/Types/NavPageInterface.php @@ -9,6 +9,7 @@ class NavPageInterface extends InterfaceType { protected $nav; + protected $attributes; public function __construct(Nav $nav) { diff --git a/src/GraphQL/Types/ReplicatorSetType.php b/src/GraphQL/Types/ReplicatorSetType.php index aaf85321a8..18d2b277df 100644 --- a/src/GraphQL/Types/ReplicatorSetType.php +++ b/src/GraphQL/Types/ReplicatorSetType.php @@ -8,6 +8,7 @@ class ReplicatorSetType extends \Rebing\GraphQL\Support\Type { protected $fieldtype; protected $handle; + protected $attributes; public function __construct($fieldtype, $name, $handle) { diff --git a/src/GraphQL/Types/ReplicatorSetsType.php b/src/GraphQL/Types/ReplicatorSetsType.php index 8f5c8c36d5..4ac4242ba9 100644 --- a/src/GraphQL/Types/ReplicatorSetsType.php +++ b/src/GraphQL/Types/ReplicatorSetsType.php @@ -9,6 +9,7 @@ class ReplicatorSetsType extends UnionType { protected $fieldtype; + protected $attributes; protected $types; protected $typeMap; diff --git a/src/GraphQL/Types/TermType.php b/src/GraphQL/Types/TermType.php index 9c6f2b57a9..b1b0105043 100644 --- a/src/GraphQL/Types/TermType.php +++ b/src/GraphQL/Types/TermType.php @@ -12,6 +12,7 @@ class TermType extends \Rebing\GraphQL\Support\Type { private $taxonomy; private $blueprint; + private $attributes; public function __construct($taxonomy, $blueprint) { diff --git a/src/GraphQL/Types/TreeBranchType.php b/src/GraphQL/Types/TreeBranchType.php index 2a077c7502..18943f4711 100644 --- a/src/GraphQL/Types/TreeBranchType.php +++ b/src/GraphQL/Types/TreeBranchType.php @@ -6,6 +6,8 @@ abstract class TreeBranchType extends \Rebing\GraphQL\Support\Type { + private $attributes; + public function __construct() { $this->attributes['name'] = static::NAME; diff --git a/src/Http/Resources/CP/Entries/Entries.php b/src/Http/Resources/CP/Entries/Entries.php index 6674ed200d..b9172f8676 100644 --- a/src/Http/Resources/CP/Entries/Entries.php +++ b/src/Http/Resources/CP/Entries/Entries.php @@ -12,6 +12,7 @@ class Entries extends ResourceCollection public $collects = ListedEntry::class; protected $blueprint; + protected $columns; protected $columnPreferenceKey; public function blueprint($blueprint) diff --git a/src/Http/Resources/CP/Submissions/Submissions.php b/src/Http/Resources/CP/Submissions/Submissions.php index 152848e358..3b51ff3106 100644 --- a/src/Http/Resources/CP/Submissions/Submissions.php +++ b/src/Http/Resources/CP/Submissions/Submissions.php @@ -12,6 +12,7 @@ class Submissions extends ResourceCollection public $collects = ListedSubmission::class; protected $blueprint; + protected $columnPreferenceKey; protected $columns; public function blueprint($blueprint) diff --git a/src/Http/Resources/CP/Taxonomies/Terms.php b/src/Http/Resources/CP/Taxonomies/Terms.php index 3d9dc96e30..99b349ab2c 100644 --- a/src/Http/Resources/CP/Taxonomies/Terms.php +++ b/src/Http/Resources/CP/Taxonomies/Terms.php @@ -13,6 +13,7 @@ class Terms extends ResourceCollection public $collects = ListedTerm::class; protected $blueprint; protected $columnPreferenceKey; + protected $columns; public function blueprint($blueprint) { diff --git a/src/Ignition/SolutionProviders/UsingOldClass.php b/src/Ignition/SolutionProviders/UsingOldClass.php index 322a775b40..731d20b73b 100644 --- a/src/Ignition/SolutionProviders/UsingOldClass.php +++ b/src/Ignition/SolutionProviders/UsingOldClass.php @@ -10,6 +10,7 @@ class UsingOldClass implements HasSolutionsForThrowable { + protected $oldClass; protected $class; public function canSolve(Throwable $throwable): bool diff --git a/src/View/Antlers/Language/Parser/DocumentParser.php b/src/View/Antlers/Language/Parser/DocumentParser.php index 09721759e4..eba2e52295 100644 --- a/src/View/Antlers/Language/Parser/DocumentParser.php +++ b/src/View/Antlers/Language/Parser/DocumentParser.php @@ -66,8 +66,8 @@ class DocumentParser * @var AntlersNodeParser|null */ private $nodeParser = null; - private $chars = []; - private $charLen = 0; + private array $chars = []; + private int $charLen = 0; /** * Maintains a reference to the last produced AntlersNode to reduce lookups. diff --git a/src/View/Debugbar/AntlersProfiler/PerformanceTracer.php b/src/View/Debugbar/AntlersProfiler/PerformanceTracer.php index 39a5e3035d..505a7b7db0 100644 --- a/src/View/Debugbar/AntlersProfiler/PerformanceTracer.php +++ b/src/View/Debugbar/AntlersProfiler/PerformanceTracer.php @@ -49,17 +49,17 @@ class PerformanceTracer implements RuntimeTracerContract /** * @var PerformanceObject[] */ - private $sourceViewObjects = []; + private array $sourceViewObjects = []; - private $triggeredTemplateContent = ''; + private string $triggeredTemplateContent = ''; - private $runtimeSamples = []; + private array $runtimeSamples = []; - private $memorySampleBaseline = 0; + private int $memorySampleBaseline = 0; private $firstSampleTime = null; - protected $foundLayoutTrigger = false; + protected bool $foundLayoutTrigger = false; public function __construct() { diff --git a/tests/Stache/FeatureTest.php b/tests/Stache/FeatureTest.php index ddac20b275..614de3ee03 100644 --- a/tests/Stache/FeatureTest.php +++ b/tests/Stache/FeatureTest.php @@ -12,7 +12,6 @@ use Statamic\Facades\Structure; use Statamic\Facades\Taxonomy; use Statamic\Facades\User; -use Statamic\Stache\Stache; use Tests\TestCase; class FeatureTest extends TestCase diff --git a/tests/Stache/Repositories/GlobalVariablesRepositoryTest.php b/tests/Stache/Repositories/GlobalVariablesRepositoryTest.php index 722e326b10..b8c5aeceed 100644 --- a/tests/Stache/Repositories/GlobalVariablesRepositoryTest.php +++ b/tests/Stache/Repositories/GlobalVariablesRepositoryTest.php @@ -17,6 +17,7 @@ class GlobalVariablesRepositoryTest extends TestCase { private $directory; private $repo; + private $globalRepo; private function setUpSingleSite() { diff --git a/tests/Support/Concerns/TestsIlluminateStr.php b/tests/Support/Concerns/TestsIlluminateStr.php index d65376b644..4db9d4091f 100644 --- a/tests/Support/Concerns/TestsIlluminateStr.php +++ b/tests/Support/Concerns/TestsIlluminateStr.php @@ -4,7 +4,6 @@ use Exception; use Ramsey\Uuid\UuidInterface; -use ReflectionClass; use Statamic\Support\Str; /** From 435553e5c03c89fab8b627cb2d55a911312aa655 Mon Sep 17 00:00:00 2001 From: Martin Dub Date: Wed, 15 Nov 2023 13:48:23 +0100 Subject: [PATCH 2/7] Public manifest --- src/Extend/Manifest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Extend/Manifest.php b/src/Extend/Manifest.php index 1f3978dc49..ea0c95aca5 100644 --- a/src/Extend/Manifest.php +++ b/src/Extend/Manifest.php @@ -11,7 +11,7 @@ class Manifest extends PackageManifest { - protected $manifest; + public $manifest; public function build() { From 3cef6271a7b669a5c31f7bdb41c6005b2d2f9cde Mon Sep 17 00:00:00 2001 From: Martin Dub Date: Wed, 15 Nov 2023 14:13:07 +0100 Subject: [PATCH 3/7] fix access level --- src/CP/Columns.php | 2 +- src/GraphQL/Types/AssetType.php | 2 +- src/GraphQL/Types/TreeBranchType.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CP/Columns.php b/src/CP/Columns.php index 4bef6638b1..4ca104cb63 100644 --- a/src/CP/Columns.php +++ b/src/CP/Columns.php @@ -7,7 +7,7 @@ class Columns extends Collection { - private $items; + protected $items; /** * Ensure has column. * diff --git a/src/GraphQL/Types/AssetType.php b/src/GraphQL/Types/AssetType.php index 0a7a140b52..55dde920ad 100644 --- a/src/GraphQL/Types/AssetType.php +++ b/src/GraphQL/Types/AssetType.php @@ -11,7 +11,7 @@ class AssetType extends \Rebing\GraphQL\Support\Type { private $container; private $blueprint; - private array $attributes; + private $attributes; public function __construct($container) { diff --git a/src/GraphQL/Types/TreeBranchType.php b/src/GraphQL/Types/TreeBranchType.php index 18943f4711..bd5c3085e9 100644 --- a/src/GraphQL/Types/TreeBranchType.php +++ b/src/GraphQL/Types/TreeBranchType.php @@ -6,7 +6,7 @@ abstract class TreeBranchType extends \Rebing\GraphQL\Support\Type { - private $attributes; + protected $attributes; public function __construct() { From eb2140366d380b09e6501389513fd1ed15620c8c Mon Sep 17 00:00:00 2001 From: Martin Dub Date: Wed, 15 Nov 2023 14:21:13 +0100 Subject: [PATCH 4/7] fix access level --- src/GraphQL/Types/AssetType.php | 2 +- src/GraphQL/Types/GlobalSetType.php | 2 +- src/GraphQL/Types/TermType.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GraphQL/Types/AssetType.php b/src/GraphQL/Types/AssetType.php index 55dde920ad..7147a509c8 100644 --- a/src/GraphQL/Types/AssetType.php +++ b/src/GraphQL/Types/AssetType.php @@ -11,7 +11,7 @@ class AssetType extends \Rebing\GraphQL\Support\Type { private $container; private $blueprint; - private $attributes; + protected $attributes; public function __construct($container) { diff --git a/src/GraphQL/Types/GlobalSetType.php b/src/GraphQL/Types/GlobalSetType.php index 438fe16709..fd08dbe89f 100644 --- a/src/GraphQL/Types/GlobalSetType.php +++ b/src/GraphQL/Types/GlobalSetType.php @@ -9,7 +9,7 @@ class GlobalSetType extends \Rebing\GraphQL\Support\Type { private $globals; - private $attributes; + protected $attributes; public function __construct($globals) { diff --git a/src/GraphQL/Types/TermType.php b/src/GraphQL/Types/TermType.php index b1b0105043..4fceaf322b 100644 --- a/src/GraphQL/Types/TermType.php +++ b/src/GraphQL/Types/TermType.php @@ -12,7 +12,7 @@ class TermType extends \Rebing\GraphQL\Support\Type { private $taxonomy; private $blueprint; - private $attributes; + protected $attributes; public function __construct($taxonomy, $blueprint) { From 0e3fa679b3a9918abde89aa0b2a2b2c00471eff8 Mon Sep 17 00:00:00 2001 From: Martin Dub Date: Wed, 15 Nov 2023 14:28:05 +0100 Subject: [PATCH 5/7] Practice makes perfect --- src/CP/Columns.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CP/Columns.php b/src/CP/Columns.php index 4ca104cb63..89fe26264d 100644 --- a/src/CP/Columns.php +++ b/src/CP/Columns.php @@ -8,6 +8,7 @@ class Columns extends Collection { protected $items; + /** * Ensure has column. * From 5b3a44f6c2fde2a44ca9a3298273ad01c5352725 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 15 Nov 2023 11:17:59 -0500 Subject: [PATCH 6/7] these are defined in the parent class --- src/Auth/Passwords/TokenRepository.php | 1 - src/CP/Columns.php | 2 -- src/Extend/Manifest.php | 2 -- src/GraphQL/Types/AssetType.php | 1 - src/GraphQL/Types/EntryType.php | 1 - src/GraphQL/Types/GlobalSetType.php | 1 - src/GraphQL/Types/GridItemType.php | 1 - src/GraphQL/Types/NavBasicPageType.php | 1 - src/GraphQL/Types/NavEntryPageType.php | 1 - src/GraphQL/Types/NavPageInterface.php | 1 - src/GraphQL/Types/ReplicatorSetType.php | 1 - src/GraphQL/Types/ReplicatorSetsType.php | 1 - src/GraphQL/Types/TermType.php | 1 - src/GraphQL/Types/TreeBranchType.php | 2 -- 14 files changed, 17 deletions(-) diff --git a/src/Auth/Passwords/TokenRepository.php b/src/Auth/Passwords/TokenRepository.php index 236310c54d..9b226c8b5f 100644 --- a/src/Auth/Passwords/TokenRepository.php +++ b/src/Auth/Passwords/TokenRepository.php @@ -15,7 +15,6 @@ class TokenRepository extends DatabaseTokenRepository protected $hasher; protected $hashKey; protected $expires; - protected $throttle; protected $path; public function __construct(Filesystem $files, HasherContract $hasher, $table, $hashKey, $expires = 60, $throttle = 60) diff --git a/src/CP/Columns.php b/src/CP/Columns.php index 89fe26264d..a07e92228d 100644 --- a/src/CP/Columns.php +++ b/src/CP/Columns.php @@ -7,8 +7,6 @@ class Columns extends Collection { - protected $items; - /** * Ensure has column. * diff --git a/src/Extend/Manifest.php b/src/Extend/Manifest.php index ea0c95aca5..b038b02637 100644 --- a/src/Extend/Manifest.php +++ b/src/Extend/Manifest.php @@ -11,8 +11,6 @@ class Manifest extends PackageManifest { - public $manifest; - public function build() { $this->manifest = null; diff --git a/src/GraphQL/Types/AssetType.php b/src/GraphQL/Types/AssetType.php index 7147a509c8..7f307367d7 100644 --- a/src/GraphQL/Types/AssetType.php +++ b/src/GraphQL/Types/AssetType.php @@ -11,7 +11,6 @@ class AssetType extends \Rebing\GraphQL\Support\Type { private $container; private $blueprint; - protected $attributes; public function __construct($container) { diff --git a/src/GraphQL/Types/EntryType.php b/src/GraphQL/Types/EntryType.php index 62139352be..97cefe0e08 100644 --- a/src/GraphQL/Types/EntryType.php +++ b/src/GraphQL/Types/EntryType.php @@ -12,7 +12,6 @@ class EntryType extends \Rebing\GraphQL\Support\Type { protected $collection; protected $blueprint; - protected $attributes; public function __construct($collection, $blueprint) { diff --git a/src/GraphQL/Types/GlobalSetType.php b/src/GraphQL/Types/GlobalSetType.php index fd08dbe89f..92212501a1 100644 --- a/src/GraphQL/Types/GlobalSetType.php +++ b/src/GraphQL/Types/GlobalSetType.php @@ -9,7 +9,6 @@ class GlobalSetType extends \Rebing\GraphQL\Support\Type { private $globals; - protected $attributes; public function __construct($globals) { diff --git a/src/GraphQL/Types/GridItemType.php b/src/GraphQL/Types/GridItemType.php index 94365d680c..9648cd4fc4 100644 --- a/src/GraphQL/Types/GridItemType.php +++ b/src/GraphQL/Types/GridItemType.php @@ -8,7 +8,6 @@ class GridItemType extends Type { protected $fieldtype; - protected $attributes; public function __construct($fieldtype, $name) { diff --git a/src/GraphQL/Types/NavBasicPageType.php b/src/GraphQL/Types/NavBasicPageType.php index f4c3cad8cc..3cb6f2ea8f 100644 --- a/src/GraphQL/Types/NavBasicPageType.php +++ b/src/GraphQL/Types/NavBasicPageType.php @@ -10,7 +10,6 @@ class NavBasicPageType extends \Rebing\GraphQL\Support\Type { protected $nav; - protected $attributes; public function __construct($nav) { diff --git a/src/GraphQL/Types/NavEntryPageType.php b/src/GraphQL/Types/NavEntryPageType.php index ef2ceabeb8..7e386c7c9b 100644 --- a/src/GraphQL/Types/NavEntryPageType.php +++ b/src/GraphQL/Types/NavEntryPageType.php @@ -14,7 +14,6 @@ class NavEntryPageType extends \Rebing\GraphQL\Support\Type protected $nav; protected $collection; protected $blueprint; - protected $attributes; public function __construct($nav, $collection, $blueprint) { diff --git a/src/GraphQL/Types/NavPageInterface.php b/src/GraphQL/Types/NavPageInterface.php index e6c6ce6974..f464713edd 100644 --- a/src/GraphQL/Types/NavPageInterface.php +++ b/src/GraphQL/Types/NavPageInterface.php @@ -9,7 +9,6 @@ class NavPageInterface extends InterfaceType { protected $nav; - protected $attributes; public function __construct(Nav $nav) { diff --git a/src/GraphQL/Types/ReplicatorSetType.php b/src/GraphQL/Types/ReplicatorSetType.php index 18d2b277df..aaf85321a8 100644 --- a/src/GraphQL/Types/ReplicatorSetType.php +++ b/src/GraphQL/Types/ReplicatorSetType.php @@ -8,7 +8,6 @@ class ReplicatorSetType extends \Rebing\GraphQL\Support\Type { protected $fieldtype; protected $handle; - protected $attributes; public function __construct($fieldtype, $name, $handle) { diff --git a/src/GraphQL/Types/ReplicatorSetsType.php b/src/GraphQL/Types/ReplicatorSetsType.php index 4ac4242ba9..8f5c8c36d5 100644 --- a/src/GraphQL/Types/ReplicatorSetsType.php +++ b/src/GraphQL/Types/ReplicatorSetsType.php @@ -9,7 +9,6 @@ class ReplicatorSetsType extends UnionType { protected $fieldtype; - protected $attributes; protected $types; protected $typeMap; diff --git a/src/GraphQL/Types/TermType.php b/src/GraphQL/Types/TermType.php index 4fceaf322b..9c6f2b57a9 100644 --- a/src/GraphQL/Types/TermType.php +++ b/src/GraphQL/Types/TermType.php @@ -12,7 +12,6 @@ class TermType extends \Rebing\GraphQL\Support\Type { private $taxonomy; private $blueprint; - protected $attributes; public function __construct($taxonomy, $blueprint) { diff --git a/src/GraphQL/Types/TreeBranchType.php b/src/GraphQL/Types/TreeBranchType.php index bd5c3085e9..2a077c7502 100644 --- a/src/GraphQL/Types/TreeBranchType.php +++ b/src/GraphQL/Types/TreeBranchType.php @@ -6,8 +6,6 @@ abstract class TreeBranchType extends \Rebing\GraphQL\Support\Type { - protected $attributes; - public function __construct() { $this->attributes['name'] = static::NAME; From 78a9a729614e818fb95c7014906401372aa4df51 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 15 Nov 2023 11:18:08 -0500 Subject: [PATCH 7/7] out of pr scope --- src/Fieldtypes/Sets.php | 1 + src/View/Antlers/Language/Parser/DocumentParser.php | 4 ++-- .../Debugbar/AntlersProfiler/PerformanceTracer.php | 10 +++++----- tests/Stache/FeatureTest.php | 1 + tests/Support/Concerns/TestsIlluminateStr.php | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Fieldtypes/Sets.php b/src/Fieldtypes/Sets.php index 94e6c9a61a..bac456f7f6 100644 --- a/src/Fieldtypes/Sets.php +++ b/src/Fieldtypes/Sets.php @@ -2,6 +2,7 @@ namespace Statamic\Fieldtypes; +use Statamic\Fields\Fieldset; use Statamic\Fields\FieldTransformer; use Statamic\Fields\Fieldtype; use Statamic\Support\Arr; diff --git a/src/View/Antlers/Language/Parser/DocumentParser.php b/src/View/Antlers/Language/Parser/DocumentParser.php index eba2e52295..09721759e4 100644 --- a/src/View/Antlers/Language/Parser/DocumentParser.php +++ b/src/View/Antlers/Language/Parser/DocumentParser.php @@ -66,8 +66,8 @@ class DocumentParser * @var AntlersNodeParser|null */ private $nodeParser = null; - private array $chars = []; - private int $charLen = 0; + private $chars = []; + private $charLen = 0; /** * Maintains a reference to the last produced AntlersNode to reduce lookups. diff --git a/src/View/Debugbar/AntlersProfiler/PerformanceTracer.php b/src/View/Debugbar/AntlersProfiler/PerformanceTracer.php index 505a7b7db0..39a5e3035d 100644 --- a/src/View/Debugbar/AntlersProfiler/PerformanceTracer.php +++ b/src/View/Debugbar/AntlersProfiler/PerformanceTracer.php @@ -49,17 +49,17 @@ class PerformanceTracer implements RuntimeTracerContract /** * @var PerformanceObject[] */ - private array $sourceViewObjects = []; + private $sourceViewObjects = []; - private string $triggeredTemplateContent = ''; + private $triggeredTemplateContent = ''; - private array $runtimeSamples = []; + private $runtimeSamples = []; - private int $memorySampleBaseline = 0; + private $memorySampleBaseline = 0; private $firstSampleTime = null; - protected bool $foundLayoutTrigger = false; + protected $foundLayoutTrigger = false; public function __construct() { diff --git a/tests/Stache/FeatureTest.php b/tests/Stache/FeatureTest.php index 614de3ee03..ddac20b275 100644 --- a/tests/Stache/FeatureTest.php +++ b/tests/Stache/FeatureTest.php @@ -12,6 +12,7 @@ use Statamic\Facades\Structure; use Statamic\Facades\Taxonomy; use Statamic\Facades\User; +use Statamic\Stache\Stache; use Tests\TestCase; class FeatureTest extends TestCase diff --git a/tests/Support/Concerns/TestsIlluminateStr.php b/tests/Support/Concerns/TestsIlluminateStr.php index 4db9d4091f..d65376b644 100644 --- a/tests/Support/Concerns/TestsIlluminateStr.php +++ b/tests/Support/Concerns/TestsIlluminateStr.php @@ -4,6 +4,7 @@ use Exception; use Ramsey\Uuid\UuidInterface; +use ReflectionClass; use Statamic\Support\Str; /**