Add automated phpcbf fixes

Signed-off-by: Andi Rückauer <arueckauer@gmail.com>
laminas · Oct 11, 2021 · 0a146bc · 0a146bc
1 parent e7f92d2
commit 0a146bc
Show file tree

Hide file tree

Showing 17 changed files with 88 additions and 59 deletions.
diff --git a/src/ArrayProvider.php b/src/ArrayProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ConfigAggregator;
 
 /**
@@ -9,9 +11,7 @@
  */
 class ArrayProvider
 {
-    /**
-     * @var array
-     */
+    /** @var array */
     private $config;
 
     /**

diff --git a/src/ConfigAggregator.php b/src/ConfigAggregator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ConfigAggregator;
 
 use Brick\VarExporter\ExportException;
@@ -36,7 +38,7 @@ class ConfigAggregator
     /**
      * @todo Make this constant private in version 2.0.0
      */
-    public const CACHE_TEMPLATE = <<< 'EOT'
+    public const CACHE_TEMPLATE = <<<'EOT'
 <?php
 
 /**
@@ -47,9 +49,7 @@ class ConfigAggregator
 
 EOT;
 
-    /**
-     * @var array
-     */
+    /** @var array */
     private $config;
 
     /**
@@ -191,7 +191,6 @@ private function mergeArray(array $a, array $b): array
      * @param mixed|array $config Configuration generated by the $provider.
      * @param callable $provider Provider responsible for generating $config;
      *     used for exception messages only.
-     * @return void
      * @throws InvalidConfigProviderException
      */
     private function mergeConfig(&$mergedConfig, $config, callable $provider): void
@@ -219,7 +218,7 @@ private function loadConfigFromProviders(iterable $providers): array
         $mergedConfig = [];
         foreach ($providers as $provider) {
             $provider = $this->resolveProvider($provider);
-            $config = $provider();
+            $config   = $provider();
             if (! $config instanceof Generator) {
                 $this->mergeConfig($mergedConfig, $config, $provider);
                 continue;
@@ -237,7 +236,6 @@ private function loadConfigFromProviders(iterable $providers): array
      * Attempt to load the configuration from a cache file.
      *
      * @param null|string $cachedConfigFile
-     * @return bool
      */
     private function loadConfigFromCache($cachedConfigFile): bool
     {
@@ -273,7 +271,7 @@ private function cacheConfig(array $config, $cachedConfigFile): void
         try {
             $contents = sprintf(
                 self::CACHE_TEMPLATE,
-                get_class($this),
+                static::class,
                 date('c'),
                 VarExporter::export($config, VarExporter::ADD_RETURN | VarExporter::CLOSURE_SNAPSHOT_USES)
             );
@@ -292,16 +290,14 @@ private function postProcessConfig(array $processors, array $config): array
     {
         foreach ($processors as $processor) {
             $processor = $this->resolveProcessor($processor);
-            $config = $processor($config);
+            $config    = $processor($config);
         }
 
         return $config;
     }
 
     /**
      * @param Closure|object|callable $variable
-     *
-     * @return string
      */
     private function detectVariableType($variable): string
     {

diff --git a/src/ConfigCannotBeCachedException.php b/src/ConfigCannotBeCachedException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ConfigAggregator;
 
 use Brick\VarExporter\ExportException;
@@ -10,8 +12,6 @@
 class ConfigCannotBeCachedException extends RuntimeException
 {
     /**
-     * @param ExportException $exportException
-     *
      * @return ConfigCannotBeCachedException
      */
     public static function fromExporterException(ExportException $exportException)

diff --git a/src/GlobTrait.php b/src/GlobTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ConfigAggregator;
 
 use Laminas\Stdlib\Glob;

diff --git a/src/InvalidConfigProcessorException.php b/src/InvalidConfigProcessorException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ConfigAggregator;
 
 use RuntimeException;
@@ -8,10 +10,8 @@
 
 class InvalidConfigProcessorException extends RuntimeException
 {
-
     /**
      * @param string $processor
-     *
      * @return InvalidConfigProcessorException
      */
     public static function fromNamedProcessor($processor)
@@ -24,7 +24,6 @@ public static function fromNamedProcessor($processor)
 
     /**
      * @param string $type
-     *
      * @return InvalidConfigProcessorException
      */
     public static function fromUnsupportedType($type)

diff --git a/src/InvalidConfigProviderException.php b/src/InvalidConfigProviderException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ConfigAggregator;
 
 use RuntimeException;
@@ -8,10 +10,8 @@
 
 class InvalidConfigProviderException extends RuntimeException
 {
-
     /**
      * @param string $provider
-     *
      * @return InvalidConfigProviderException
      */
     public static function fromNamedProvider($provider)
@@ -24,7 +24,6 @@ public static function fromNamedProvider($provider)
 
     /**
      * @param string $type
-     *
      * @return InvalidConfigProviderException
      */
     public static function fromUnsupportedType($type)

diff --git a/src/LaminasConfigProvider.php b/src/LaminasConfigProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ConfigAggregator;
 
 use Laminas\Config\Factory as ConfigFactory;

diff --git a/src/PhpFileProvider.php b/src/PhpFileProvider.php
@@ -1,7 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ConfigAggregator;
 
+use Generator;
+
 /**
  * Provide a collection of PHP files returning config arrays.
  */
@@ -21,7 +25,7 @@ public function __construct($pattern)
     }
 
     /**
-     * @return \Generator
+     * @return Generator
      */
     public function __invoke()
     {

diff --git a/test/ArrayProviderTest.php b/test/ArrayProviderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ConfigAggregator;
 
 use Laminas\ConfigAggregator\ArrayProvider;