Merge branch 'cleanup'

Author: lkrms

.phive/phars.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.82" location="./tools/pretty-php" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.46.0" installed="3.65.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.87" location="./tools/pretty-php" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.46.0" installed="3.68.0" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="salient-labs/changelog" version="^1.0.5" installed="1.0.8" location="./tools/changelog" copy="true"/>
 </phive>

composer.lock

@@ -21,8 +21,6 @@ parameters:
 	universalObjectCratesClasses:
 		- Salient\Contract\Core\Entity\Extensible
 	ignoreErrors:
-		-
-			identifier: property.unusedType
 		-
 			identifier: trait.unused
 		-
@@ -81,7 +79,3 @@ parameters:
 				- tests/fixtures/Toolkit/PHPStan/Utility/Type/ArrFlattenReturnTypeExtensionAssertions.php
 				- tests/fixtures/Toolkit/PHPStan/Utility/Type/ArrWhereNotEmptyReturnTypeExtensionAssertions.php
 				- tests/fixtures/Toolkit/PHPStan/Utility/Type/ArrWhereNotNullReturnTypeExtensionAssertions.php
-		-
-			identifier: property.unused
-			paths:
-				- tests/fixtures/Toolkit/PHPStan/Core/Rules/TypesAssignedByHasMutatorRuleFailures.php

phpstan.neon.dist

@@ -64,6 +64,7 @@
 use Salient\Utility\File;
 use Salient\Utility\Json;
 use Salient\Utility\Package;
+use Salient\Utility\Reflect;
 use Salient\Utility\Regex;
 
 $dir = dirname(__DIR__);
@@ -136,14 +137,9 @@
 $generateEntity = new GenerateSyncEntity($app);
 $generateProvider = new GenerateSyncProvider($app);
 
-$class = new ReflectionClass(EnvVar::class);
-foreach ($class->getReflectionConstants() as $constant) {
-    if (!$constant->isPublic()) {
-        continue;
-    }
-    /** @var string */
-    $value = $constant->getValue();
-    Env::unset($value);
+/** @var string $name */
+foreach (Reflect::getConstants(EnvVar::class) as $name) {
+    Env::unset($name);
 }
 
 /** @var string[] */

scripts/generate.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+
+namespace Salient\PHPStan\Core\Rules;
+
+use PHPStan\Reflection\PropertyReflection;
+use PHPStan\Rules\Properties\ReadWritePropertiesExtension;
+use Salient\Core\Concern\HasMutator;
+
+class HasMutatorReadWritePropertiesExtension implements ReadWritePropertiesExtension
+{
+    public function isAlwaysRead(PropertyReflection $property, string $propertyName): bool
+    {
+        return $this->classHasMutator($property);
+    }
+
+    public function isAlwaysWritten(PropertyReflection $property, string $propertyName): bool
+    {
+        return $this->classHasMutator($property);
+    }
+
+    public function isInitialized(PropertyReflection $property, string $propertyName): bool
+    {
+        return $this->classHasMutator($property);
+    }
+
+    public function classHasMutator(PropertyReflection $property): bool
+    {
+        $classReflection = $property->getDeclaringClass();
+        foreach ($classReflection->getTraits(true) as $traitReflection) {
+            if ($traitReflection->getName() === HasMutator::class) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

src/Toolkit/PHPStan/Core/Rules/HasMutatorReadWritePropertiesExtension.php

@@ -1,4 +1,9 @@
 services:
+	-
+		class: Salient\PHPStan\Core\Rules\HasMutatorReadWritePropertiesExtension
+		tags:
+			- phpstan.properties.readWriteExtension
+
 	-
 		class: Salient\PHPStan\Core\Rules\TypesAssignedByHasMutatorRule
 		tags:

src/Toolkit/PHPStan/phpstan.extension.neon

@@ -137,11 +137,12 @@ public function getSyncProviderReflectionEntities(): array
      *
      * @template T of SyncEntityInterface
      *
-     * @param ReflectionSyncEntity<T>|class-string<T>|T $entity
+     * @param ReflectionClass<T>|class-string<T>|T $entity
      */
     public function isSyncEntityProvider($entity): bool
     {
-        if ($entity instanceof ReflectionSyncEntity) {
+        if ($entity instanceof ReflectionClass) {
+            /** @var class-string<T> */
             $entity = $entity->name;
         } elseif ($entity instanceof SyncEntityInterface) {
             $entity = get_class($entity);

src/Toolkit/Sync/Reflection/ReflectionSyncProvider.php

@@ -17,7 +17,6 @@
 use Salient\Contract\Sync\SyncStoreInterface;
 use Salient\Iterator\IterableIterator;
 use Salient\Sync\Exception\SyncOperationNotImplementedException;
-use Salient\Sync\Reflection\ReflectionSyncProvider;
 use Salient\Sync\SyncUtil;
 use Generator;
 use LogicException;
@@ -82,13 +81,7 @@ public function __construct(
             ));
         }
 
-        if (!(new ReflectionSyncProvider($provider))->isSyncEntityProvider($entity)) {
-            throw new LogicException(sprintf(
-                '%s does not service %s',
-                get_class($provider),
-                $entity,
-            ));
-        }
+        $entity = SyncUtil::getServicedEntityType($entity, $provider, $container);
 
         $this->Entity = $entity;
         $this->Provider = $provider;

src/Toolkit/Sync/Support/SyncEntityProvider.php

@@ -8,10 +8,13 @@
 use Salient\Contract\Sync\SyncProviderInterface;
 use Salient\Contract\Sync\SyncStoreInterface;
 use Salient\Core\Facade\Sync;
+use Salient\Sync\Reflection\ReflectionSyncProvider;
 use Salient\Utility\AbstractUtility;
 use Salient\Utility\Arr;
 use Salient\Utility\Get;
 use Salient\Utility\Regex;
+use LogicException;
+use ReflectionClass;
 
 final class SyncUtil extends AbstractUtility
 {
@@ -51,6 +54,51 @@ public static function isWriteOperation(int $operation): bool
         ][$operation] ?? false;
     }
 
+    /**
+     * With a sync entity type and any non-abstract parents bound to it in a
+     * service container, get the first that is serviced by a provider
+     *
+     * @template T of SyncEntityInterface
+     *
+     * @param class-string<T> $entityType
+     * @return class-string<T>
+     * @throws LogicException if the provider does not service the entity type.
+     */
+    public static function getServicedEntityType(
+        string $entityType,
+        SyncProviderInterface $provider,
+        ContainerInterface $container
+    ): string {
+        $provider = new ReflectionSyncProvider($provider);
+        if ($provider->isSyncEntityProvider($entityType)) {
+            return $entityType;
+        }
+
+        $entity = new ReflectionClass($entityType);
+        do {
+            $entity = $entity->getParentClass();
+            if (
+                !$entity
+                || $entity->isAbstract()
+            ) {
+                throw new LogicException(sprintf(
+                    '%s does not service %s',
+                    $provider->name,
+                    $entityType,
+                ));
+            }
+            if (
+                is_a($container->getName($entity->name), $entityType, true)
+                && $provider->isSyncEntityProvider($entity)
+            ) {
+                break;
+            }
+        } while (true);
+
+        /** @var class-string<T> */
+        return $entity->name;
+    }
+
     /**
      * Get the name of a sync entity type's provider interface
      *

src/Toolkit/Sync/SyncUtil.php

@@ -41,7 +41,7 @@ final class MyClass extends MyBaseClass
     // @phpstan-ignore property.unused
     private static ?int $MyNullableStaticTypedProperty;
 
-    // @phpstan-ignore property.onlyWritten
+    // @phpstan-ignore property.onlyWritten, property.unusedType
     private static ?int $MyNullableStaticTypedPropertyWithDefault = null;
 
     /**