Fix issue with only being possible to add one handler of the same typ…

…e to content type/global handlers
netgen · Apr 22, 2015 · 8ef6ac3 · 8ef6ac3
1 parent 7f433d4
commit 8ef6ac3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -28,10 +28,13 @@ public function getConfigTreeBuilder()
                 ->normalizeKeys( false )
                 ->prototype( 'array' )
                     ->requiresAtLeastOneElement()
-                    ->useAttributeAsKey( 'handler' )
                     ->normalizeKeys( false )
                     ->prototype( 'array' )
                         ->children()
+                            ->scalarNode( 'handler' )
+                                ->isRequired()
+                                ->cannotBeEmpty()
+                            ->end()
                             ->scalarNode( 'tag' )
                                 ->isRequired()
                                 ->cannotBeEmpty()
@@ -44,10 +47,13 @@ public function getConfigTreeBuilder()
                 ->end()
             ->end()
             ->arrayNode( 'global_handlers' )
-                ->useAttributeAsKey( 'handler' )
                 ->normalizeKeys( false )
                 ->prototype( 'array' )
                     ->children()
+                        ->scalarNode( 'handler' )
+                            ->isRequired()
+                            ->cannotBeEmpty()
+                        ->end()
                         ->scalarNode( 'tag' )
                             ->isRequired()
                             ->cannotBeEmpty()

diff --git a/MetaTag/Collector.php b/MetaTag/Collector.php
@@ -65,9 +65,9 @@ public function collect( Content $content )
             );
         }
 
-        foreach ( $allHandlers as $handlerName => $handler )
+        foreach ( $allHandlers as $handler )
         {
-            $metaTagHandler = $this->metaTagHandlers->getHandler( $handlerName );
+            $metaTagHandler = $this->metaTagHandlers->getHandler( $handler['handler'] );
             if ( $metaTagHandler instanceof ContentAware )
             {
                 $metaTagHandler->setContent( $content );
@@ -79,7 +79,7 @@ public function collect( Content $content )
                 if ( !$metaTag instanceof Item )
                 {
                     throw new LogicException(
-                        '\'' . $handlerName . '\' handler returned wrong value.' .
+                        '\'' . $handler['handler'] . '\' handler returned wrong value.' .
                         ' Expected \'Netgen\Bundle\OpenGraphBundle\MetaTag\Item\', got \'' . get_class( $metaTag ) . '\'.' );
                 }
 

diff --git a/Resources/doc/CHANGELOG.md b/Resources/doc/CHANGELOG.md
@@ -1,6 +1,10 @@
 Netgen Open Graph Bundle changelog
 ==================================
 
+## 1.0.1 (22.04.2015)
+
+* Fix issue with being able to add only one handler of the same type
+
 ## 1.0 (21.11.2014)
 
 * Initial release