Prepare v2.2

KnpLabs · Oct 29, 2018 · ccb9b90 · ccb9b90
1 parent afd670e
commit ccb9b90
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -50,7 +50,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "2.2.x-dev"
         }
     },
     "suggest": {

diff --git a/src/Knp/DictionaryBundle/Dictionary/CallableDictionary.php b/src/Knp/DictionaryBundle/Dictionary/CallableDictionary.php
@@ -14,7 +14,7 @@ public function __construct(string $name, callable $callable, array $callableArg
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 Invokable::class
             ),

diff --git a/src/Knp/DictionaryBundle/Dictionary/CombinedDictionary.php b/src/Knp/DictionaryBundle/Dictionary/CombinedDictionary.php
@@ -14,7 +14,7 @@ public function __construct(string $name, array $dictionaries)
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 Combined::class
             ),

diff --git a/src/Knp/DictionaryBundle/Dictionary/DictionaryRegistry.php b/src/Knp/DictionaryBundle/Dictionary/DictionaryRegistry.php
@@ -22,7 +22,7 @@ public function __construct(Collection $collection)
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 Collection::class
             ),

diff --git a/src/Knp/DictionaryBundle/Dictionary/Factory/CallableFactory.php b/src/Knp/DictionaryBundle/Dictionary/Factory/CallableFactory.php
@@ -21,7 +21,7 @@ public function __construct(Container $container)
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 Factory\Invokable::class
             ),

diff --git a/src/Knp/DictionaryBundle/Dictionary/Factory/Combined.php b/src/Knp/DictionaryBundle/Dictionary/Factory/Combined.php
@@ -37,7 +37,7 @@ public function create(string $name, array $config): Dictionary
             return $this->dictionaries[$name];
         }, $config['dictionaries']);
 
-        return new Dictionary\CombinedDictionary($name, $dictionaries);
+        return new Dictionary\Combined($name, $dictionaries);
     }
 
     /**

diff --git a/src/Knp/DictionaryBundle/Dictionary/Factory/FactoryAggregate.php b/src/Knp/DictionaryBundle/Dictionary/Factory/FactoryAggregate.php
@@ -18,7 +18,7 @@ public function __construct(Dictionary\Factory\Aggregate $aggregate)
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 Dictionary\Factory\Aggregate::class
             ),

diff --git a/src/Knp/DictionaryBundle/Dictionary/SimpleDictionary.php b/src/Knp/DictionaryBundle/Dictionary/SimpleDictionary.php
@@ -14,7 +14,7 @@ public function __construct(string $name, array $values)
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 Simple::class
             ),

diff --git a/src/Knp/DictionaryBundle/Dictionary/TraceableDictionary.php b/src/Knp/DictionaryBundle/Dictionary/TraceableDictionary.php
@@ -15,7 +15,7 @@ public function __construct(Dictionary $dictionary, DictionaryDataCollector $col
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 Traceable::class
             ),

diff --git a/src/Knp/DictionaryBundle/Dictionary/ValueTransformer.php b/src/Knp/DictionaryBundle/Dictionary/ValueTransformer.php
@@ -5,7 +5,7 @@
 namespace Knp\DictionaryBundle\Dictionary;
 
 /**
- * @deprecated Interface Knp\DictionaryBundle\Dictionary\ValueTransformer is deprecated since version 2.1, to be removed in 3.0. Use Knp\DictionaryBundle\ValueTransformer instead.
+ * @deprecated Interface Knp\DictionaryBundle\Dictionary\ValueTransformer is deprecated since version 2.2, to be removed in 3.0. Use Knp\DictionaryBundle\ValueTransformer instead.
  */
 interface ValueTransformer extends \Knp\DictionaryBundle\ValueTransformer
 {

diff --git a/src/Knp/DictionaryBundle/Dictionary/ValueTransformer/ConstantTransformer.php b/src/Knp/DictionaryBundle/Dictionary/ValueTransformer/ConstantTransformer.php
@@ -18,7 +18,7 @@ public function __construct()
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 Constant::class
             ),

diff --git a/src/Knp/DictionaryBundle/Dictionary/ValueTransformer/TransformerAggregate.php b/src/Knp/DictionaryBundle/Dictionary/ValueTransformer/TransformerAggregate.php
@@ -18,7 +18,7 @@ public function __construct()
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 Aggregate::class
             ),

diff --git a/src/Knp/DictionaryBundle/Resources/config/legacy/services/factories.yaml b/src/Knp/DictionaryBundle/Resources/config/legacy/services/factories.yaml
@@ -29,10 +29,6 @@ services:
     public: false
     alias: Knp\DictionaryBundle\Dictionary\Factory\Combined
 
-  Knp\DictionaryBundle\Dictionary\Factory:
-    public: true
-    alias: Knp\DictionaryBundle\Dictionary\Factory\FactoryAggregate
-
   Knp\DictionaryBundle\Dictionary\Factory\FactoryAggregate:
     public: false
     arguments:

diff --git a/src/Knp/DictionaryBundle/Twig/DictionaryExtension.php b/src/Knp/DictionaryBundle/Twig/DictionaryExtension.php
@@ -20,7 +20,7 @@ public function __construct(Collection $dictionaries)
     {
         @trigger_error(
             sprintf(
-                'Class %s is deprecated since version 2.1, to be removed in 3.0. Use %s instead.',
+                'Class %s is deprecated since version 2.2, to be removed in 3.0. Use %s instead.',
                 __CLASS__,
                 \Knp\DictionaryBundle\Templating\Extension\Dictionary::class
             ),