Merge pull request #44 from kokspflanze/php81-update

update tests for laminas-workflow
kokspflanze · Dec 5, 2021 · cededa7 · cededa7
2 parents c44ad0b + df69897
commit cededa7
Show file tree

Hide file tree

Showing 28 changed files with 244 additions and 333 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,7 @@
-nbproject
-._*
-.~lock.*
-.buildpath
-.DS_Store
-.idea
-.project
-.settings
-composer.phar
 composer.lock
+composer.phar
+clover.xml
+phpunit.xml
 vendor
+.idea
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     ],
     "require": {
         "php": "^7.3 || ~8.0.0 || ~8.1.0",
-        "twig/twig": "^3.0.1",
+        "twig/twig": "^3.3.4",
         "laminas/laminas-mvc": "^3.0",
         "laminas/laminas-view": "^2.7",
         "laminas/laminas-servicemanager": "^3.0",
@@ -40,7 +40,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "ZfcTwigTest\\": "tests/ZfcTwigTest"
+            "ZfcTwigTest\\": "test/"
         }
     },
     "require-dev": {
@@ -68,6 +68,6 @@
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
-        "test": "phpunit --colors=always --configuration tests/phpunit.xml"
+        "test": "phpunit --colors=always --configuration phpunit.xml.dist"
     }
 }
diff --git a/phpcs.xml b/phpcs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset name="Laminas coding standard">
+    <rule ref="./vendor/laminas/laminas-coding-standard/src/LaminasCodingStandard/ruleset.xml"/>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>test</file>
+</ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         verbose="true"
+         stopOnFailure="false"
+         processIsolation="false"
+         backupGlobals="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage includeUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <clover outputFile="./build/logs/clover.xml"/>
+            <text outputFile="php://stdout"/>
+        </report>
+    </coverage>
+    <testsuite name="BjyAuthorize tests">
+        <directory>./test</directory>
+    </testsuite>
+</phpunit>
diff --git a/src/Module.php b/src/Module.php
@@ -1,27 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 namespace ZfcTwig;
 
 use InvalidArgumentException;
-use Twig\Environment;
 use Laminas\EventManager\EventInterface;
 use Laminas\ModuleManager\Feature\BootstrapListenerInterface;
 use Laminas\ModuleManager\Feature\ConfigProviderInterface;
-use function is_string;
+use Twig\Environment;
+
 use function is_object;
+use function is_string;
 
 class Module implements
     BootstrapListenerInterface,
     ConfigProviderInterface
 {
     /**
-     * @param EventInterface $e
-     * @throws InvalidArgumentException
+     * {@inheritDoc}
      */
-    public function onBootstrap(EventInterface $e): void
+    public function onBootstrap(EventInterface $event): void
     {
-        /** @var \Laminas\Mvc\MvcEvent $e*/
-        $application    = $e->getApplication();
+        $application    = $event->getApplication();
         $serviceManager = $application->getServiceManager();
         $environment    = $serviceManager->get(Environment::class);
 
@@ -39,7 +40,7 @@ public function onBootstrap(EventInterface $e): void
                 } else {
                     $extension = new $extension();
                 }
-            } elseif (!is_object($extension)) {
+            } elseif (! is_object($extension)) {
                 throw new InvalidArgumentException('Extensions should be a string or object.');
             }
 
@@ -54,5 +55,4 @@ public function getConfig(): array
     {
         return include __DIR__ . '/../config/module.config.php';
     }
-
 }
diff --git a/src/ModuleOptions.php b/src/ModuleOptions.php
@@ -1,63 +1,44 @@
 <?php
 
+declare(strict_types=1);
+
 namespace ZfcTwig;
 
 use Laminas\Stdlib\AbstractOptions;
 
 class ModuleOptions extends AbstractOptions
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $environmentLoader = '';
 
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $environmentClass = '';
 
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $environmentOptions = [];
 
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $globals = [];
 
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $loaderChain = [];
 
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $extensions = [];
 
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $suffix = '';
 
-    /**
-     * @var bool
-     */
+    /** @var bool */
     protected $enableFallbackFunctions = true;
 
-    /**
-     * @var bool
-     */
+    /** @var bool */
     protected $disableZfmodel = true;
 
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $helperManager = [];
 
     /**
-     * @param boolean $disableZfmodel
      * @return $this
      */
     public function setDisableZfmodel(bool $disableZfmodel): self
@@ -66,16 +47,12 @@ public function setDisableZfmodel(bool $disableZfmodel): self
         return $this;
     }
 
-    /**
-     * @return boolean
-     */
     public function getDisableZfmodel(): bool
     {
         return $this->disableZfmodel;
     }
 
     /**
-     * @param boolean $enableFallbackFunctions
      * @return $this
      */
     public function setEnableFallbackFunctions(bool $enableFallbackFunctions): self
@@ -84,16 +61,12 @@ public function setEnableFallbackFunctions(bool $enableFallbackFunctions): self
         return $this;
     }
 
-    /**
-     * @return boolean
-     */
     public function getEnableFallbackFunctions(): bool
     {
         return $this->enableFallbackFunctions;
     }
 
     /**
-     * @param string $environmentLoader
      * @return $this
      */
     public function setEnvironmentLoader(string $environmentLoader): self
@@ -102,9 +75,6 @@ public function setEnvironmentLoader(string $environmentLoader): self
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getEnvironmentLoader(): string
     {
         return $this->environmentLoader;
@@ -183,7 +153,6 @@ public function getLoaderChain(): array
     }
 
     /**
-     * @param string $suffix
      * @return $this
      */
     public function setSuffix(string $suffix): self
@@ -192,25 +161,16 @@ public function setSuffix(string $suffix): self
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getSuffix(): string
     {
         return $this->suffix;
     }
 
-    /**
-     * @param string $environmentClass
-     */
     public function setEnvironmentClass(string $environmentClass)
     {
         $this->environmentClass = $environmentClass;
     }
 
-    /**
-     * @return string
-     */
     public function getEnvironmentClass(): string
     {
         return $this->environmentClass;
@@ -231,5 +191,4 @@ public function getGlobals(): array
     {
         return $this->globals;
     }
-
 }
diff --git a/src/ModuleOptionsFactory.php b/src/ModuleOptionsFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace ZfcTwig;
 
 use Interop\Container\ContainerInterface;
@@ -8,16 +10,14 @@
 class ModuleOptionsFactory implements FactoryInterface
 {
     /**
-     * @param ContainerInterface $container
      * @param string $requestedName
      * @param array|null $options
      * @return ModuleOptions
      */
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
     {
         $config = $container->get('config');
 
         return new ModuleOptions($config['zfctwig'] ?? []);
     }
-
 }
diff --git a/src/Twig/ChainLoaderFactory.php b/src/Twig/ChainLoaderFactory.php
@@ -1,23 +1,25 @@
 <?php
 
+declare(strict_types=1);
+
 namespace ZfcTwig\Twig;
 
 use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
-use Twig\Loader;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Twig\Loader;
 use ZfcTwig\ModuleOptions;
+
 use function is_string;
 
 class ChainLoaderFactory implements FactoryInterface
 {
     /**
-     * @param ContainerInterface $container
      * @param string $requestedName
      * @param array|null $options
      * @return Loader\ChainLoader
      */
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
     {
         /** @var ModuleOptions $options */
         $options = $container->get(ModuleOptions::class);
@@ -26,13 +28,12 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         $chain = new Loader\ChainLoader();
 
         foreach ($options->getLoaderChain() as $loader) {
-            if (!is_string($loader) || !$container->has($loader)) {
+            if (! is_string($loader) || ! $container->has($loader)) {
                 throw new InvalidArgumentException('Loaders should be a service manager alias.');
             }
             $chain->addLoader($container->get($loader));
         }
 
         return $chain;
     }
-
-}
+}