thecodingmachine / yaml-definition-loader

src/YamlDefinitionLoader.php

Unused Use Statements -3 removed lines

@@ -4,9 +4,7 @@ 
 use Assembly\AliasDefinition;
 use Assembly\FactoryDefinition;
 use Assembly\InstanceDefinition;
-use Assembly\MethodCall;
 use Assembly\ParameterDefinition;
-use Assembly\PropertyAssignment;
 use Assembly\Reference;
 use Interop\Container\Definition\DefinitionInterface;
 use Interop\Container\Definition\DefinitionProviderInterface;
@@ -14,7 +12,6 @@ 
 use Symfony\Component\Yaml\Parser;
 use TheCodingMachine\Definition\Exception\FileNotFoundException;
 use TheCodingMachine\Definition\Exception\InvalidArgumentException;
-use TheCodingMachine\Definition\Exception\RuntimeException;
 
 class YamlDefinitionLoader implements DefinitionProviderInterface
 {

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
             $importFileName = $import['resource'];
 
             if (strpos($importFileName, '/') !== 0) {
-                $importFileName = dirname($this->fileName).'/'.$importFileName;
+                $importFileName = dirname($this->fileName) . '/' . $importFileName;
             }
 
             $yamlDefinitionLoader = new self($importFileName);
@@ -207,12 +207,12 @@ 
             if (is_string($service['factory'])) {
                 if (strpos($service['factory'], ':') !== false && strpos($service['factory'], '::') === false) {
                     $parts = explode(':', $service['factory']);
-                    $definition = new FactoryDefinition($id, $this->resolveServices('@'.$parts[0]), $parts[1]);
+                    $definition = new FactoryDefinition($id, $this->resolveServices('@' . $parts[0]), $parts[1]);
                 } elseif (strpos($service['factory'], ':') !== false && strpos($service['factory'], '::') !== false) {
                     $parts = explode('::', $service['factory']);
                     $definition = new FactoryDefinition($id, $parts[0], $parts[1]);
                 } else {
-                    throw new InvalidArgumentException('A "factory" must be in the format "service_name:method_name" or "class_name::method_name".Got "'.$service['factory'].'"');
+                    throw new InvalidArgumentException('A "factory" must be in the format "service_name:method_name" or "class_name::method_name".Got "' . $service['factory'] . '"');
                 }
             } else {
                 $definition = new FactoryDefinition($id, $this->resolveServices($service['factory'][0]), $service['factory'][1]);
@@ -357,9 +357,9 @@ 
     {
         if (is_array($value)) {
             return array_map(array($this, 'resolveServices'), $value);
-        } elseif (is_string($value) &&  0 === strpos($value, '@=')) {
+        } elseif (is_string($value) && 0 === strpos($value, '@=')) {
             throw new InvalidArgumentException('Expressions (starting by "@=") are not supported by YamlDefinitionLoader. This is a Symfony specific feature.');
-        } elseif (is_string($value) &&  0 === strpos($value, '@')) {
+        } elseif (is_string($value) && 0 === strpos($value, '@')) {
             if (0 === strpos($value, '@@')) {
                 return substr($value, 1);
             } elseif (0 === strpos($value, '@?')) {
@@ -367,7 +367,7 @@ 
             } else {
                 $value = substr($value, 1);
                 if ('=' === substr($value, -1)) {
-                    throw new InvalidArgumentException('Non-strict services (ending with "=") are not supported by YamlDefinitionLoader. This is a Symfony specific feature.');            } else {
+                    throw new InvalidArgumentException('Non-strict services (ending with "=") are not supported by YamlDefinitionLoader. This is a Symfony specific feature.'); } else {
                 }
                 return new Reference($value);
             }