renamed Container::freeze() to Container::compile()

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php

@@ -65,7 +65,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         // doctrine.dbal.mysql_connection
         $arguments = $container->getDefinition('doctrine.dbal.mysql_connection')->getArguments();
@@ -99,7 +99,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         // doctrine.dbal.mysql_connection
         $arguments = $container->getDefinition('doctrine.dbal.mysql_connection')->getArguments();
@@ -222,7 +222,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.dbal.default_connection');
         $this->assertEquals('Doctrine\DBAL\DriverManager', $definition->getClass());
@@ -258,7 +258,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.dbal.default_connection');
         $this->assertEquals('Doctrine\DBAL\DriverManager', $definition->getClass());
@@ -297,7 +297,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.dbal.conn1_connection');
         $this->assertEquals('Doctrine\DBAL\DriverManager', $definition->getClass());
@@ -465,7 +465,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.orm.dm1_metadata_cache');
         $this->assertDICDefinitionClass($definition, '%doctrine.orm.cache.xcache_class%');
@@ -484,7 +484,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.orm.default_metadata_cache');
         $this->assertDICDefinitionClass($definition, 'Doctrine\Common\Cache\MemcacheCache');
@@ -507,7 +507,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $this->assertEquals('apc', $container->getParameter('doctrine.orm.metadata_cache_driver'));
         $this->assertTrue($container->getParameter('doctrine.orm.auto_generate_proxy_classes'));
@@ -523,7 +523,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $this->loadFromFile($container, 'orm_single_em_bundle_mappings');
 
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.orm.default_metadata_driver');
 
@@ -569,7 +569,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $this->loadFromFile($container, 'orm_multiple_em_bundle_mappings');
 
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $def1 = $container->getDefinition('doctrine.orm.em1_metadata_driver');
         $def2 = $container->getDefinition('doctrine.orm.em2_metadata_driver');

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php

@@ -111,7 +111,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.odm.mongodb.default_connection');
         $this->assertEquals('%doctrine.odm.mongodb.connection_class%', $definition->getClass());
@@ -145,7 +145,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.odm.mongodb.default_connection');
         $this->assertEquals('%doctrine.odm.mongodb.connection_class%', $definition->getClass());
@@ -173,7 +173,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.odm.mongodb.conn1_connection');
         $this->assertEquals('%doctrine.odm.mongodb.connection_class%', $definition->getClass());
@@ -267,7 +267,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.odm.mongodb.dm1_metadata_cache');
         $this->assertEquals('%doctrine.odm.mongodb.cache.xcache_class%', $definition->getClass());
@@ -286,7 +286,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $definition = $container->getDefinition('doctrine.odm.mongodb.default_metadata_cache');
         $this->assertEquals('Doctrine\Common\Cache\MemcacheCache', $definition->getClass());
@@ -314,7 +314,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         $this->assertEquals('apc', $container->getParameter('doctrine.odm.mongodb.metadata_cache_driver'));
         $this->assertTrue($container->getParameter('doctrine.odm.mongodb.auto_generate_proxy_classes'));

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/SecurityExtensionTest.php

@@ -99,7 +99,7 @@ abstract class SecurityExtensionTest extends TestCase
 
         $container->getCompilerPassConfig()->setOptimizationPasses(array());
         $container->getCompilerPassConfig()->setRemovingPasses(array());
-        $container->freeze();
+        $container->compile();
 
         return $container;
     }

src/Symfony/Component/DependencyInjection/Container.php

@@ -70,14 +70,14 @@ class Container implements ContainerInterface
     }
 
     /**
-     * Freezes the container.
+     * Compiles the container.
      *
      * This method does two things:
      *
      *  * Parameter values are resolved;
      *  * The parameter bag is frozen.
      */
-    public function freeze()
+    public function compile()
     {
         $this->parameterBag->resolve();
 

src/Symfony/Component/DependencyInjection/ContainerBuilder.php

@@ -329,20 +329,24 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     }
 
     /**
-     * Freezes the container.
+     * Compiles the container.
      *
-     * This method does four things:
+     * This method passes the container to compiler
+     * passes whose job is to manipulate and optimize
+     * the container.
+     *
+     * The main compiler passes roughly do four things:
      *
      *  * The extension configurations are merged;
      *  * Parameter values are resolved;
-     *  * The parameter bag is freezed;
+     *  * The parameter bag is frozen;
      *  * Extension loading is disabled.
      */
-    public function freeze()
+    public function compile()
     {
         $this->compiler->compile($this);
 
-        parent::freeze();
+        parent::compile();
     }
 
     /**

src/Symfony/Component/HttpKernel/Kernel.php

@@ -360,7 +360,8 @@ abstract class Kernel implements HttpKernelInterface, \Serializable
         if (null !== $cont = $this->registerContainerConfiguration($this->getContainerLoader($container))) {
             $container->merge($cont);
         }
-        $container->freeze();
+        $container->compile();
+
         return $container;
     }
 

src/Symfony/Component/HttpKernel/bootstrap.php

@@ -201,7 +201,7 @@ class Container implements ContainerInterface
         $this->services = array();
         $this->set('service_container', $this);
     }
-    public function freeze()
+    public function compile()
     {
         $this->parameterBag->resolve();
         $this->parameterBag = new FrozenParameterBag($this->parameterBag->all());

tests/Symfony/Tests/Component/DependencyInjection/Compiler/IntegrationTest.php

@@ -39,7 +39,7 @@ class IntegrationTest extends \PHPUnit_Framework_TestCase
             ->setPublic(false)
         ;
 
-        $container->freeze();
+        $container->compile();
 
         $this->assertTrue($container->hasDefinition('a'));
         $arguments = $a->getArguments();
@@ -64,7 +64,7 @@ class IntegrationTest extends \PHPUnit_Framework_TestCase
             ->setPublic(false)
         ;
 
-        $container->freeze();
+        $container->compile();
 
         $this->assertTrue($container->hasDefinition('a'));
         $arguments = $a->getArguments();
@@ -94,7 +94,7 @@ class IntegrationTest extends \PHPUnit_Framework_TestCase
             ->setPublic(false)
         ;
 
-        $container->freeze();
+        $container->compile();
 
         $this->assertTrue($container->hasDefinition('a'));
         $this->assertFalse($container->hasDefinition('b'));

tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php

@@ -327,14 +327,14 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
         $config = new ContainerBuilder(new ParameterBag(array('foo' => '%bar%')));
         $container->merge($config);
 ////// FIXME
-        $container->freeze();
+        $container->compile();
         $this->assertEquals(array('bar' => 'foo', 'foo' => 'foo'), $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
 
         $container = new ContainerBuilder(new ParameterBag(array('bar' => 'foo')));
         $config = new ContainerBuilder(new ParameterBag(array('foo' => '%bar%', 'baz' => '%foo%')));
         $container->merge($config);
 ////// FIXME
-        $container->freeze();
+        $container->compile();
         $this->assertEquals(array('bar' => 'foo', 'foo' => 'foo', 'baz' => 'foo'), $container->getParameterBag()->all(), '->merge() evaluates the values of the parameters towards already defined ones');
 
         $container = new ContainerBuilder();
@@ -364,7 +364,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
     public function testMergeLogicException()
     {
         $container = new ContainerBuilder();
-        $container->freeze();
+        $container->compile();
         $container->merge(new ContainerBuilder());
     }
 
@@ -458,7 +458,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
     public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()
     {
         $container = new ContainerBuilder();
-        $container->freeze();
+        $container->compile();
         $container->set('a', new \stdClass());
     }
 
@@ -468,7 +468,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
     public function testThrowsExceptionWhenSetDefinitionOnAFrozenContainer()
     {
         $container = new ContainerBuilder();
-        $container->freeze();
+        $container->compile();
         $container->setDefinition('a', new Definition());
     }
 

tests/Symfony/Tests/Component/DependencyInjection/ContainerTest.php

@@ -29,14 +29,14 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @covers Symfony\Component\DependencyInjection\Container::freeze
+     * @covers Symfony\Component\DependencyInjection\Container::compile
      */
-    public function testFreeze()
+    public function testcompile()
     {
         $sc = new Container(new ParameterBag(array('foo' => 'bar')));
-        $sc->freeze();
-        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag', $sc->getParameterBag(), '->freeze() changes the parameter bag to a FrozenParameterBag instance');
-        $this->assertEquals(array('foo' => 'bar'), $sc->getParameterBag()->all(), '->freeze() copies the current parameters to the new parameter bag');
+        $sc->compile();
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag', $sc->getParameterBag(), '->compile() changes the parameter bag to a FrozenParameterBag instance');
+        $this->assertEquals(array('foo' => 'bar'), $sc->getParameterBag()->all(), '->compile() copies the current parameters to the new parameter bag');
     }
 
     /**
@@ -46,7 +46,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
     {
         $sc = new Container(new ParameterBag(array('foo' => 'bar')));
         $this->assertFalse($sc->isFrozen(), '->isFrozen() returns false if the parameters are not frozen');
-        $sc->freeze();
+        $sc->compile();
         $this->assertTrue($sc->isFrozen(), '->isFrozen() returns true if the parameters are frozen');
     }
 

tests/Symfony/Tests/Component/DependencyInjection/Dumper/PhpDumperTest.php

@@ -123,7 +123,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
         $interfaceInjector->addMethodCall('setBar', array('someValue'));
         $container = include self::$fixturesPath.'/containers/interfaces1.php';
         $container->addInterfaceInjector($interfaceInjector);
-        $container->freeze();
+        $container->compile();
 
         $dumper = new PhpDumper($container);
 

tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php

@@ -194,7 +194,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
 
         // extension without an XSD
         $loader->load('extensions/services1.xml');
-        $container->freeze();
+        $container->compile();
         $services = $container->getDefinitions();
         $parameters = $container->getParameterBag()->all();
 
@@ -210,7 +210,7 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $container->registerExtension(new \ProjectWithXsdExtension());
         $loader = new ProjectLoader2($container, self::$fixturesPath.'/xml');
         $loader->load('extensions/services2.xml');
-        $container->freeze();
+        $container->compile();
         $services = $container->getDefinitions();
         $parameters = $container->getParameterBag()->all();
 

tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php

@@ -123,7 +123,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $container->registerExtension(new \ProjectExtension());
         $loader = new ProjectLoader3($container, self::$fixturesPath.'/yaml');
         $loader->load('services10.yml');
-        $container->freeze();
+        $container->compile();
         $services = $container->getDefinitions();
         $parameters = $container->getParameterBag()->all();