Dec 8, 2016 · Dec 8, 2016
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
                $this->yamlParser = new YamlParser();
            }

            // This method may throw an exception. Do not modify the class'
            // state before it completes
            if (false === ($classes = $this->parseFile($this->file))) {
                return false;
            }

            $this->classes = $classes;
            $this->classes = $this->parseFile($this->file);

            if (isset($this->classes['namespaces'])) {
                foreach ($this->classes['namespaces'] as $alias => $namespace) {
     *
     * @param string $path The path of the YAML file
     *
     * @return array|null The class descriptions or null, if the file was empty
     * @return array The class descriptions
     *
     * @throws \InvalidArgumentException If the file could not be loaded or did
     *                                   not contain a YAML array

        // empty file
        if (null === $classes) {
            return;
            return array();
        }

        // not an array
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
        $metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');

        $this->assertFalse($loader->loadClassMetadata($metadata));

        $r = new \ReflectionProperty($loader, 'classes');
        $r->setAccessible(true);
        $this->assertSame(array(), $r->getValue($loader));
    }

    /**
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,13 +46,7 @@ public function loadClassMetadata(ClassMetadata $metadata)
		$this->yamlParser = new YamlParser();
		}

		// This method may throw an exception. Do not modify the class'
		// state before it completes
		if (false === ($classes = $this->parseFile($this->file))) {
		return false;
		}

		$this->classes = $classes;
		$this->classes = $this->parseFile($this->file);

		if (isset($this->classes['namespaces'])) {
		foreach ($this->classes['namespaces'] as $alias => $namespace) {
Expand DownExpand Up		@@ -111,7 +105,7 @@ protected function parseNodes(array $nodes)
		*
		* @param string $path The path of the YAML file
		*
		* @return array\|null The class descriptions or null, if the file was empty
		* @return array The class descriptions
		*
		* @throws \InvalidArgumentException If the file could not be loaded or did
		* not contain a YAML array
Expand All		@@ -126,7 +120,7 @@ private function parseFile($path)

		// empty file
		if (null === $classes) {
		return;
		return array();
		}

		// not an array
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,6 +31,10 @@ public function testLoadClassMetadataReturnsFalseIfEmpty()
		$metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');

		$this->assertFalse($loader->loadClassMetadata($metadata));

		$r = new \ReflectionProperty($loader, 'classes');
		$r->setAccessible(true);
		$this->assertSame(array(), $r->getValue($loader));
		}

		/**
Expand Down