Merge effbadd into efa5544

laminas · Mar 25, 2020 · 467a334 · 467a334
2 parents efa5544 + effbadd
commit 467a334
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 11 deletions.
diff --git a/src/Autoloader.php b/src/Autoloader.php
@@ -12,6 +12,18 @@
 use Composer\Autoload\ClassLoader;
 use RuntimeException;
 
+use function array_values;
+use function class_alias;
+use function class_exists;
+use function explode;
+use function file_exists;
+use function interface_exists;
+use function spl_autoload_register;
+use function strlen;
+use function strtr;
+use function substr;
+use function trait_exists;
+
 /**
  * Alias legacy Zend Framework project classes/interfaces/traits to Laminas equivalents.
  */

diff --git a/src/ConfigPostProcessor.php b/src/ConfigPostProcessor.php
@@ -10,6 +10,14 @@
 
 use function array_flip;
 use function array_intersect_key;
+use function array_key_exists;
+use function array_pop;
+use function array_push;
+use function count;
+use function is_array;
+use function is_callable;
+use function is_int;
+use function is_string;
 
 class ConfigPostProcessor
 {

diff --git a/src/Replacements.php b/src/Replacements.php
@@ -8,6 +8,9 @@
 
 namespace Laminas\ZendFrameworkBridge;
 
+use function array_merge;
+use function strtr;
+
 class Replacements
 {
     /** @var string[] */
@@ -20,7 +23,7 @@ public function __construct(array $additionalReplacements = [])
             $additionalReplacements
         );
     }
-    
+
     /**
      * @param string $value
      * @return string

diff --git a/src/autoload.php b/src/autoload.php
@@ -6,4 +6,4 @@
  * @license   https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
  */
 
-\Laminas\ZendFrameworkBridge\Autoloader::load();
+Laminas\ZendFrameworkBridge\Autoloader::load();
diff --git a/test/AutoloaderTest.php b/test/AutoloaderTest.php
@@ -11,6 +11,10 @@
 use Laminas\LegacyTypeHint;
 use PHPUnit\Framework\TestCase;
 
+use function class_exists;
+use function get_class;
+use function interface_exists;
+
 class AutoloaderTest extends TestCase
 {
     /**
@@ -132,6 +136,7 @@ public function reverseClassProvider()
 
     /**
      * @dataProvider reverseClassProvider
+     *
      * @param string $actual
      * @param string $legacy
      */

diff --git a/test/ConfigPostProcessorTest.php b/test/ConfigPostProcessorTest.php
@@ -11,6 +11,8 @@
 use Laminas\ZendFrameworkBridge\ConfigPostProcessor;
 use PHPUnit\Framework\TestCase;
 
+use function sprintf;
+
 class ConfigPostProcessorTest extends TestCase
 {
     /**
@@ -30,6 +32,7 @@ public function configurations()
 
     /**
      * @dataProvider configurations
+     *
      * @param string $configFile
      */
     public function testRewritesNestedKeys($configFile)

diff --git a/test/ModuleTest.php b/test/ModuleTest.php
@@ -11,6 +11,8 @@
 use Laminas\ZendFrameworkBridge\Module;
 use PHPUnit\Framework\TestCase;
 
+use function sprintf;
+
 class ModuleTest extends TestCase
 {
     public function testInitRegistersListenerWithEventManager()
@@ -38,6 +40,7 @@ public function configurations()
 
     /**
      * @dataProvider configurations
+     *
      * @param string $configFile
      */
     public function testOnMergeConfigProcessesAndReplacesConfigurationPulledFromListener($configFile)

diff --git a/test/ReplacementsTest.php b/test/ReplacementsTest.php
@@ -11,6 +11,8 @@
 use Laminas\ZendFrameworkBridge\Replacements;
 use PHPUnit\Framework\TestCase;
 
+use function file_get_contents;
+
 class ReplacementsTest extends TestCase
 {
     /**
@@ -30,44 +32,45 @@ public function edgeCases()
         ];
         yield 'Auryn' => [
             'Northwoods\Container\Zend\Config',
-            'Northwoods\Container\Zend\Config'
+            'Northwoods\Container\Zend\Config',
         ];
         yield 'Expressive ZendRouter' => [
             'Zend\Expressive\Router\ZendRouter',
-            'Mezzio\Router\LaminasRouter'
+            'Mezzio\Router\LaminasRouter',
         ];
         yield 'Expressive ZendView Renderer' => [
             'Zend\Expressive\ZendView\ZendViewRenderer',
-            'Mezzio\LaminasView\LaminasViewRenderer'
+            'Mezzio\LaminasView\LaminasViewRenderer',
         ];
         yield 'Expressive ACL Authorizations' => [
             'Zend\Expressive\Authorization\Acl\ZendAcl',
-            'Mezzio\Authorization\Acl\LaminasAcl'
+            'Mezzio\Authorization\Acl\LaminasAcl',
         ];
         yield 'Expressive RBAC Authorizations' => [
             'Zend\Expressive\Authorization\Rbac\ZendRbac',
-            'Mezzio\Authorization\Rbac\LaminasRbac'
+            'Mezzio\Authorization\Rbac\LaminasRbac',
         ];
         yield 'Cache Zend Server abstract adapter' => [
             'Zend\Cache\Storage\Adapter\AbstractZendServer',
-            'Laminas\Cache\Storage\Adapter\AbstractZendServer'
+            'Laminas\Cache\Storage\Adapter\AbstractZendServer',
         ];
         yield 'Cache Zend Server Disk adapter' => [
             'Zend\Cache\Storage\Adapter\ZendServerDisk',
-            'Laminas\Cache\Storage\Adapter\ZendServerDisk'
+            'Laminas\Cache\Storage\Adapter\ZendServerDisk',
         ];
         yield 'Cache Zend Server Shm adapter' => [
             'Zend\Cache\Storage\Adapter\ZendServerShm',
-            'Laminas\Cache\Storage\Adapter\ZendServerShm'
+            'Laminas\Cache\Storage\Adapter\ZendServerShm',
         ];
         yield 'Log Zend Monitor writer' => [
             'Zend\Log\Writer\ZendMonitor',
-            'Laminas\Log\Writer\ZendMonitor'
+            'Laminas\Log\Writer\ZendMonitor',
         ];
     }
 
     /**
      * @dataProvider edgeCases
+     *
      * @param string $string
      * @param string $expected
      */