Merge pull request #37 from Becklyn/next

Author: Jannik

CHANGELOG.md

@@ -1,3 +1,9 @@
+2.6.9
+=====
+
+*   (bug) Fix small BC break in older symfony versions.
+
+
 2.6.8
 =====
 

src/Cache/CacheWarmer.php

@@ -130,13 +130,15 @@ public function isOptional ()
     /**
      * @inheritdoc
      */
-    public function warmUp ($cacheDir) : void
+    public function warmUp ($cacheDir) : array
     {
         if (!$this->isDebug)
         {
             $this->clearCache(null);
             $this->fillCache(null);
         }
+
+        return [];
     }
 
 

src/DependencyInjection/BecklynAssetsConfiguration.php

@@ -3,6 +3,7 @@
 namespace Becklyn\AssetsBundle\DependencyInjection;
 
 use Becklyn\AssetsBundle\Asset\Asset;
+use Symfony\Component\Config\Definition\BaseNode;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -34,7 +35,7 @@ public function getConfigTreeBuilder ()
                     ->defaultFalse()
                 ->end()
                 ->arrayNode("dependency_maps")
-                    ->setDeprecated("The `becklyn_assets.dependency_maps` option is deprecated, as the the maps will always be automatically loaded.")
+                    ->setDeprecated(...$this->formatDeprecationMessage("becklyn/assets-bundle", "2.6.6", "The %path%.%node% option is deprecated, as the the maps will always be automatically loaded."))
                     ->scalarPrototype()->end()
                     ->defaultValue([])
                     ->info("The paths to the dependency maps. In asset notation: e.g. `@namespace/js/_dependencies.json`")
@@ -96,4 +97,19 @@ function (array $paths)
             ->info($description)
             ->defaultValue([]);
     }
+
+    /**
+     * Returns the correct deprecation param's as an array for setDeprecated.
+     *
+     * Symfony/Config v5.1 introduces a deprecation notice when calling
+     * setDeprecation() with less than 3 args and the getDeprecation method was
+     * introduced at the same time. By checking if getDeprecation() exists,
+     * we can determine the correct param count to use when calling setDeprecated.
+     */
+    private function formatDeprecationMessage (string $bundle, string $version, string $message) : array
+    {
+        return \method_exists(BaseNode::class, 'getDeprecation')
+            ? [$bundle, $version, $message]
+            : [$message];
+    }
 }

vendor-bin/test/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "becklyn/php-cs": "^3.0.12"
+        "becklyn/php-cs": "^6"
     }
 }