symfony · fabpot · Jul 11, 2017 · Mar 27, 2017 · stof · Mar 27, 2017
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -177,7 +177,10 @@ private function parseImports(array $content, $file)
        $defaultDirectory = dirname($file);
        foreach ($content['imports'] as $import) {
            if (!is_array($import)) {
-                throw new InvalidArgumentException(sprintf('The values in the "imports" key should be arrays in %s. Check your YAML syntax.', $file));
+                $import = array('resource' => $import);
+            }
+            if (!isset($import['resource'])) {
+                throw new InvalidArgumentException(sprintf('An import should provide a resource in %s. Check your YAML syntax.', $file));
            }

            $this->setCurrentDir($defaultDirectory);

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/bad_import.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/bad_import.yml
@@ -1,2 +1,2 @@
 imports:
-    - foo.yml
+    - { resource: ~ }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services4.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services4.yml
@@ -1,5 +1,5 @@
 imports:
-    - { resource: services2.yml }
+    - services2.yml
    - { resource: services3.yml }
    - { resource: "../php/simple.php" }
    - { resource: "../ini/parameters.ini", class: Symfony\Component\DependencyInjection\Loader\IniFileLoader }
-Original file line number
+Diff line change
@@ -177,7 +177,10 @@ private function parseImports(array $content, $file)
             $defaultDirectory = dirname($file);
             foreach ($content['imports'] as $import) {
                 if (!is_array($import)) {
-                    throw new InvalidArgumentException(sprintf('The values in the "imports" key should be arrays in %s. Check your YAML syntax.', $file));
+                    $import = array('resource' => $import);
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            stof
  

      

      

      


        Mar 27, 2017


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      only strings should be allowed to be rewritten that way, not any non-array value
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



  
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
    Contributor


      

  Author


  

  
    
      

      
            ro0NL
  

      

      

      


        Mar 27, 2017


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Do we really care? Whatever the input is; it crashes like before.
imports:
  - { resource: { breakit: config.yml } }
Warning: strlen() expects parameter 1 to be string, array given

Which actually comes from FileLoader::glob(). AFAIK the  api describes type mixed for resources. Hence i think we should just pass here... and fix the glob issue of course ^^
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+                }
+                if (!isset($import['resource'])) {
+                    throw new InvalidArgumentException(sprintf('An import should provide a resource in %s. Check your YAML syntax.', $file));
                 }
                 $this->setCurrentDir($defaultDirectory);
-          Expand Down