Dep update (#20)

Slamdunk · May 10, 2021 · aae048a · aae048a
1 parent f743b61
commit aae048a
Show file tree

Hide file tree

Showing 36 changed files with 93 additions and 179 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,7 +2,7 @@
 /tests export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.php_cs export-ignore
+.php-cs-fixer.php export-ignore
 Makefile export-ignore
 phpstan.neon export-ignore
 phpunit.xml export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 .idea/
 tmp/
 vendor/
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 composer.lock
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ all: csfix static-analysis test
 	@echo "Done."
 
 vendor: composer.json
-	composer update
+	composer update --ignore-platform-reqs
 	touch vendor
 
 .PHONY: csfix

diff --git a/composer.json b/composer.json
@@ -19,24 +19,37 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "laminas/laminas-mvc": "^3.1.1",
-        "phpstan/phpstan": "^0.12.50"
+        "laminas/laminas-mvc": "^3.2.0",
+        "phpstan/phpstan": "^0.12.86"
+    },
+    "conflict": {
+        "laminas/laminas-cache": "<2.11",
+        "laminas/laminas-filter": "<2.11",
+        "laminas/laminas-form": "<2.16",
+        "laminas/laminas-hydrator": "<4.0",
+        "laminas/laminas-i18n": "<2.11",
+        "laminas/laminas-inputfilter": "<2.12",
+        "laminas/laminas-log": "<2.13",
+        "laminas/laminas-mail": "<2.14",
+        "laminas/laminas-paginator": "<2.10",
+        "laminas/laminas-validator": "<2.14"
     },
     "require-dev": {
-        "laminas/laminas-cache": "^2.9.0",
-        "laminas/laminas-filter": "^2.9.4",
-        "laminas/laminas-form": "^2.15.0",
-        "laminas/laminas-hydrator": "^3.2 || ^4.0",
-        "laminas/laminas-i18n": "^2.10.3",
-        "laminas/laminas-inputfilter": "^2.10.1",
-        "laminas/laminas-log": "^2.12.0",
-        "laminas/laminas-mail": "^2.12.3",
-        "laminas/laminas-paginator": "^2.9.0",
-        "laminas/laminas-validator": "^2.13.4",
-        "phpstan/phpstan-phpunit": "^0.12.16",
-        "phpunit/phpunit": "^9.4.2",
-        "slam/php-cs-fixer-extensions": "^2.0.0",
-        "slam/php-debug-r": "^1.6.1"
+        "laminas/laminas-cache": "^2.11.1",
+        "laminas/laminas-filter": "^2.11.0",
+        "laminas/laminas-form": "^2.16.3",
+        "laminas/laminas-hydrator": "^4.1.0",
+        "laminas/laminas-i18n": "^2.11.1",
+        "laminas/laminas-inputfilter": "^2.12.0",
+        "laminas/laminas-log": "^2.13.1",
+        "laminas/laminas-mail": "^2.14.0",
+        "laminas/laminas-paginator": "^2.10.0",
+        "laminas/laminas-validator": "^2.14.4",
+        "malukenho/mcbumpface": "^1.1.5",
+        "phpstan/phpstan-phpunit": "^0.12.18",
+        "phpunit/phpunit": "^9.5.4",
+        "slam/php-cs-fixer-extensions": "^v3.0.1",
+        "slam/php-debug-r": "^v1.7.0"
     },
     "extra": {
         "phpstan": {

diff --git a/src/Rules/Laminas/ServiceManagerGetMethodCallRule.php b/src/Rules/Laminas/ServiceManagerGetMethodCallRule.php
@@ -21,15 +21,9 @@
  */
 final class ServiceManagerGetMethodCallRule implements Rule
 {
-    /**
-     * @var Broker
-     */
-    private $broker;
+    private Broker $broker;
 
-    /**
-     * @var ServiceManagerLoader
-     */
-    private $serviceManagerLoader;
+    private ServiceManagerLoader $serviceManagerLoader;
 
     public function __construct(Broker $broker, ServiceManagerLoader $serviceManagerLoader)
     {

diff --git a/src/ServiceManagerLoader.php b/src/ServiceManagerLoader.php
@@ -13,15 +13,12 @@
 
 final class ServiceManagerLoader
 {
-    /**
-     * @var ServiceLocatorInterface
-     */
-    private $serviceLocator;
+    private ?UnmappedAliasServiceLocatorProxy $serviceLocator = null;
 
     /**
      * @var string[]
      */
-    private $knownModules = [
+    private array $knownModules = [
         \Laminas\Cache\Module::class,
         \Laminas\Filter\Module::class,
         \Laminas\Form\Module::class,
@@ -38,7 +35,7 @@ final class ServiceManagerLoader
     /**
      * @var array<string, true>
      */
-    private $serviceManagerNames = [
+    private array $serviceManagerNames = [
         ServiceManager::class            => true,
         ServiceLocatorInterface::class   => true,
         InteropContainerInterface::class => true,
@@ -60,12 +57,7 @@ public function __construct(?string $serviceManagerLoader)
             throw new \PHPStan\ShouldNotHappenException(\sprintf('Loader "%s" doesn\'t return a ServiceManager instance', $serviceManagerLoader));
         }
 
-        $this->setServiceLocator($serviceManager);
-    }
-
-    private function setServiceLocator(ServiceLocatorInterface $serviceLocator): void
-    {
-        $this->serviceLocator = new UnmappedAliasServiceLocatorProxy($serviceLocator);
+        $this->serviceLocator = new UnmappedAliasServiceLocatorProxy($serviceManager);
     }
 
     public function getServiceLocator(string $serviceManagerName): ServiceLocatorInterface
@@ -86,7 +78,7 @@ public function getServiceLocator(string $serviceManagerName): ServiceLocatorInt
             $serviceManager->setService('ApplicationConfig', $config);
             $serviceManager->get(ModuleManager::class)->loadModules();
 
-            $this->setServiceLocator($serviceManager);
+            $this->serviceLocator = new UnmappedAliasServiceLocatorProxy($serviceManager);
         }
 
         $serviceLocator = $this->serviceLocator;

diff --git a/src/Type/Laminas/ControllerPluginClassReflectionExtension.php b/src/Type/Laminas/ControllerPluginClassReflectionExtension.php
@@ -16,15 +16,9 @@
 
 final class ControllerPluginClassReflectionExtension implements BrokerAwareExtension, MethodsClassReflectionExtension
 {
-    /**
-     * @var ServiceManagerLoader
-     */
-    private $serviceManagerLoader;
+    private ServiceManagerLoader $serviceManagerLoader;
 
-    /**
-     * @var Broker
-     */
-    private $broker;
+    private Broker $broker;
 
     public function __construct(ServiceManagerLoader $serviceManagerLoader)
     {

diff --git a/src/Type/Laminas/ObjectServiceManagerType.php b/src/Type/Laminas/ObjectServiceManagerType.php
@@ -8,10 +8,7 @@
 
 final class ObjectServiceManagerType extends ObjectType
 {
-    /**
-     * @var string
-     */
-    private $serviceName;
+    private string $serviceName;
 
     public function __construct(string $className, string $serviceName)
     {

diff --git a/...PluginMethodDynamicReturnTypeExtension/AbstractPluginMethodDynamicReturnTypeExtension.php b/...PluginMethodDynamicReturnTypeExtension/AbstractPluginMethodDynamicReturnTypeExtension.php
@@ -18,10 +18,7 @@
 
 abstract class AbstractPluginMethodDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
-    /**
-     * @var ServiceManagerLoader
-     */
-    private $serviceManagerLoader;
+    private ServiceManagerLoader $serviceManagerLoader;
 
     final public function __construct(ServiceManagerLoader $serviceManagerLoader)
     {
@@ -52,7 +49,8 @@ final public function getTypeFromMethodCall(
             return ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->args, $methodReflection->getVariants())->getReturnType();
         }
 
-        throw new \PHPStan\ShouldNotHappenException(\sprintf('Argument passed to %s::%s should be a string, %s given',
+        throw new \PHPStan\ShouldNotHappenException(\sprintf(
+            'Argument passed to %s::%s should be a string, %s given',
             $methodReflection->getDeclaringClass()->getName(),
             $methodReflection->getName(),
             $argType->describe(VerbosityLevel::value())

diff --git a/src/Type/Laminas/PluginMethodReflection.php b/src/Type/Laminas/PluginMethodReflection.php
@@ -14,20 +14,11 @@
 
 final class PluginMethodReflection implements MethodReflection
 {
-    /**
-     * @var ClassReflection
-     */
-    private $declaringClass;
+    private ClassReflection $declaringClass;
 
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
-    /**
-     * @var ObjectType
-     */
-    private $returnType;
+    private ObjectType $returnType;
 
     public function __construct(
         ClassReflection $declaringClass,

diff --git a/...rviceGetterDynamicReturnTypeExtension/AbstractServiceGetterDynamicReturnTypeExtension.php b/...rviceGetterDynamicReturnTypeExtension/AbstractServiceGetterDynamicReturnTypeExtension.php
@@ -16,15 +16,12 @@
 
 abstract class AbstractServiceGetterDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
-    /**
-     * @var ServiceManagerLoader
-     */
-    private $serviceManagerLoader;
+    private ServiceManagerLoader $serviceManagerLoader;
 
     /**
      * @var array<string, string>
      */
-    protected $methodToServiceMap = [
+    protected array $methodToServiceMap = [
         'getApplication'    => 'Application',
         'getRenderer'       => RendererInterface::class,
         'getRequest'        => 'Request',

diff --git a/...as/ServiceGetterDynamicReturnTypeExtension/ViewHelperGetterDynamicReturnTypeExtension.php b/...as/ServiceGetterDynamicReturnTypeExtension/ViewHelperGetterDynamicReturnTypeExtension.php
@@ -12,7 +12,7 @@ final class ViewHelperGetterDynamicReturnTypeExtension extends AbstractServiceGe
     /**
      * @var array<string, string>
      */
-    protected $methodToServiceMap = [
+    protected array $methodToServiceMap = [
         'getView' => RendererInterface::class,
     ];
 

diff --git a/src/Type/Laminas/ServiceManagerGetDynamicReturnTypeExtension.php b/src/Type/Laminas/ServiceManagerGetDynamicReturnTypeExtension.php
@@ -22,15 +22,9 @@
 
 final class ServiceManagerGetDynamicReturnTypeExtension implements BrokerAwareExtension, DynamicMethodReturnTypeExtension
 {
-    /**
-     * @var ServiceManagerLoader
-     */
-    private $serviceManagerLoader;
-
-    /**
-     * @var Broker
-     */
-    private $broker;
+    private ServiceManagerLoader $serviceManagerLoader;
+
+    private Broker $broker;
 
     public function __construct(ServiceManagerLoader $serviceManagerLoader)
     {

diff --git a/src/Type/Laminas/StdlibAbstractOptionsPropertiesClassReflectionExtension.php b/src/Type/Laminas/StdlibAbstractOptionsPropertiesClassReflectionExtension.php
@@ -20,22 +20,13 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
     public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
     {
         return new class($classReflection, $propertyName, $this->getGetterName($propertyName), $this->getSetterName($propertyName)) implements PropertyReflection {
-            /**
-             * @var ClassReflection
-             */
-            private $classReflection;
-            /**
-             * @var string
-             */
-            private $propertyName;
-            /**
-             * @var string
-             */
-            private $getterName;
-            /**
-             * @var string
-             */
-            private $setterName;
+            private ClassReflection $classReflection;
+
+            private string $propertyName;
+
+            private string $getterName;
+
+            private string $setterName;
 
             public function __construct(ClassReflection $classReflection, string $propertyName, string $getterName, string $setterName)
             {

diff --git a/src/UnmappedAliasServiceLocatorProxy.php b/src/UnmappedAliasServiceLocatorProxy.php
@@ -4,9 +4,6 @@
 
 namespace LaminasPhpStan;
 
-use Laminas\Cache\PatternPluginManager;
-use Laminas\Cache\PatternPluginManager\PatternPluginManagerV3Polyfill;
-use Laminas\Form\FormElementManager\FormElementManagerV3Polyfill;
 use Laminas\Log\FilterPluginManager as LogFilterPluginManager;
 use Laminas\Log\FormatterPluginManager as LogFormatterPluginManager;
 use Laminas\Log\ProcessorPluginManager as LogProcessorPluginManager;
@@ -18,28 +15,18 @@
 
 final class UnmappedAliasServiceLocatorProxy implements ServiceLocatorInterface
 {
-    /**
-     * @var ServiceLocatorInterface
-     */
-    private $serviceLocator;
+    private ServiceLocatorInterface $serviceLocator;
 
     /**
      * @var array<string, string>
      */
-    private $knownUnmappedAliasToClassServices = [
+    private array $knownUnmappedAliasToClassServices = [
         ControllerManager::class                => 'ControllerManager',
-        FormElementManagerV3Polyfill::class     => 'FormElementManager',
         HelperPluginManager::class              => 'ViewHelperManager',
         LogFilterPluginManager::class           => 'LogFilterManager',
         LogFormatterPluginManager::class        => 'LogFormatterManager',
         LogProcessorPluginManager::class        => 'LogProcessorManager',
         LogWriterPluginManager::class           => 'LogWriterManager',
-        PatternPluginManagerV3Polyfill::class   => PatternPluginManager::class,
-
-        // As string to not autoload them in static analysis, otherwise we would get
-        // a PHP Warning:  Declaration of [...] should be compatible with [...] error
-        '\Laminas\Form\FormElementManager\FormElementManager' . 'V2Polyfill'       => 'FormElementManager',
-        '\Laminas\Cache\PatternPluginManager\PatternPluginManager' . 'V2Polyfill'  => PatternPluginManager::class,
     ];
 
     public function __construct(ServiceLocatorInterface $serviceLocator)

diff --git a/tests/LaminasIntegration/data/controllerMethod-0.json b/tests/LaminasIntegration/data/controllerMethod-0.json
@@ -1,7 +1,7 @@
 [
     {
         "message": "The service \"foobar\" was not configured in Laminas\\Mvc\\Controller\\ControllerManager.",
-        "line": 25,
+        "line": 22,
         "ignorable": true
     }
 ]
diff --git a/tests/LaminasIntegration/data/controllerMethod.php b/tests/LaminasIntegration/data/controllerMethod.php
@@ -9,10 +9,7 @@
 
 final class controllerMethod
 {
-    /**
-     * @var ControllerManager
-     */
-    private $controllerManager;
+    private ControllerManager $controllerManager;
 
     public function __construct(ServiceManager $serviceManager)
     {

diff --git a/tests/LaminasIntegration/data/pluginMethodDynamicReturn-2.json b/tests/LaminasIntegration/data/pluginMethodDynamicReturn-2.json
@@ -1,12 +1,12 @@
 [
     {
         "message": "Call to an undefined method Laminas\\View\\Helper\\Url::foobar().",
-        "line": 22,
+        "line": 19,
         "ignorable": true
     },
     {
         "message": "Call to an undefined method Laminas\\View\\Helper\\AbstractHelper::foobar().",
-        "line": 28,
+        "line": 25,
         "ignorable": true
     }
 ]
diff --git a/tests/LaminasIntegration/data/pluginMethodDynamicReturn.php b/tests/LaminasIntegration/data/pluginMethodDynamicReturn.php
@@ -10,10 +10,7 @@
 
 final class pluginMethodDynamicReturn
 {
-    /**
-     * @var PhpRenderer
-     */
-    private $phpRenderer;
+    private PhpRenderer $phpRenderer;
 
     public function getDynamicTypeFromStaticString(): void
     {