Little loader refactoring

Author: wouterj

AutoRoute/Mapping/Loader/XmlFileLoader.php

@@ -75,16 +75,16 @@ protected function parseMappingNode(\DOMElement $mappingNode, $path)
         }
         $classMetadata = new ClassMetadata($className);
 
-        $classMetadata->setUrlSchema(
-            $this->readAttribute($mappingNode, 'url-schema', sprintf('for "%s" in "%s"', $className, $path))
-        );
-
         try {
+            $classMetadata->setUrlSchema(
+                $this->readAttribute($mappingNode, 'url-schema', sprintf('for "%s" in "%s"', $className, $path))
+            );
+
             $classMetadata->setExtendedClass(
                 $this->readAttribute($mappingNode, 'extend', sprintf('for "%s" in "%s"', $className, $path))
             );
         } catch (\InvalidArgumentException $e) {
-            // the extend attribute may be omitted
+            // the extend and url-schema attributes may be omitted
         }
 
         $conflictResolverNodes = $mappingNode->getElementsByTagNameNS(self::NAMESPACE_URI, 'conflict-resolver');

AutoRoute/Mapping/Loader/YmlFileLoader.php

@@ -58,39 +58,46 @@ public function load($file, $type = null)
         }
 
         $metadatas = array();
-        foreach ($config as $className => $metadata) {
-            if (!class_exists($className)) {
-                throw new \InvalidArgumentException(sprintf('Configuration found for unknown class "%s" in "%s".', $className, $path));
-            }
-            $data = new ClassMetadata($className);
+        foreach ($config as $className => $mappingNode) {
+            $metadatas[] = $this->parseMappingNode($className, $mappingNode, $path);
+        }
 
-            if (!isset($metadata['url_schema'])) {
-                throw new \InvalidArgumentException(sprintf('No URL schema specified for "%s" in "%s".', $className, $path));
-            }
-            $data->setUrlSchema($metadata['url_schema']);
+        return $metadatas;
+    }
 
-            if (isset($metadata['conflict_resolver'])) {
-                $data->setConflictResolver($this->parseServiceConfig($metadata['conflict_resolver'], $className, $path));
-            }
+    /**
+     * @param string $className
+     * @param array  $mappingNode
+     * @param string $path
+     */
+    protected function parseMappingNode($className, $mappingNode, $path)
+    {
+        if (!class_exists($className)) {
+            throw new \InvalidArgumentException(sprintf('Configuration found for unknown class "%s" in "%s".', $className, $path));
+        }
+        $classMetadata = new ClassMetadata($className);
 
-            if (isset($metadata['extend'])) {
-                $data->setExtendedClass($metadata['extend']);
-            }
+        if (isset($mappingNode['url_schema'])) {
+            $classMetadata->setUrlSchema($mappingNode['url_schema']);
+        }
 
-            // token providers can be omitted if the schema is constructed of 
-            // inherited token providers only
-            if (isset($metadata['token_providers'])) {
-                foreach ($metadata['token_providers'] as $tokenName => $provider) {
-                    $data->addTokenProvider($tokenName, $this->parseServiceConfig($provider, $className, $path));
-                }
-            }
+        if (isset($mappingNode['conflict_resolver'])) {
+            $classMetadata->setConflictResolver($this->parseServiceConfig($mappingNode['conflict_resolver'], $className, $path));
+        }
 
-            // add ClassMetadata to registered metadatas in the end, to ensure no 
-            // incomplete metadatas are registered.
-            $metadatas[] = $data;
+        if (isset($mappingNode['extend'])) {
+            $classMetadata->setExtendedClass($mappingNode['extend']);
         }
 
-        return $metadatas;
+        // token providers can be omitted if the schema is constructed of 
+        // inherited token providers only
+        if (isset($mappingNode['token_providers'])) {
+            foreach ($mappingNode['token_providers'] as $tokenName => $provider) {
+                $classMetadata->addTokenProvider($tokenName, $this->parseServiceConfig($provider, $className, $path));
+            }
+        }
+
+        return $classMetadata;
     }
 
     /**

Tests/Resources/Fixtures/loader_config/invalid2.xml

@@ -1 +1,4 @@
-stdClass: ~
+stdClass:
+    url_schema: /forum/{category}/{post_title}
+    token_providers:
+        category: [foo]

Tests/Resources/Fixtures/loader_config/invalid3.yml

@@ -74,7 +74,6 @@ public function getFailsOnInvalidConfigFilesData()
     {
         $files = array(
             'invalid1.xml',
-            'invalid2.xml',
         );
 
         return array_map(function ($file) {

Tests/Resources/Fixtures/loader_config/invalid4.yml

@@ -76,7 +76,6 @@ public function getFailsOnInvalidConfigFilesData()
             'invalid1.yml',
             'invalid2.yml',
             'invalid3.yml',
-            'invalid4.yml',
         );
 
         return array_map(function ($file) {