Removed more legacy code

symfony · dosten · Apr 1, 2015 · Apr 1, 2015 · Apr 1, 2015 · Apr 1, 2015
commit 906c78f6a317750d0d2816fa54938a41f409c354
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -210,25 +210,9 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
            'lazy' => $definition->isLazy(),
        );

-        if (method_exists($definition, 'isSynchronized')) {
-            $data['synchronized'] = $definition->isSynchronized(false);
-        }
-
        $data['abstract'] = $definition->isAbstract();
        $data['file'] = $definition->getFile();

-        if ($definition->getFactoryClass(false)) {
-            $data['factory_class'] = $definition->getFactoryClass(false);
-        }
-
-        if ($definition->getFactoryService(false)) {
-            $data['factory_service'] = $definition->getFactoryService(false);
-        }
-
-        if ($definition->getFactoryMethod(false)) {
-            $data['factory_method'] = $definition->getFactoryMethod(false);
-        }
-
        if ($factory = $definition->getFactory()) {
            if (is_array($factory)) {
                if ($factory[0] instanceof Reference) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
@@ -182,28 +182,12 @@ protected function describeContainerDefinition(Definition $definition, array $op
            ."\n".'- Lazy: '.($definition->isLazy() ? 'yes' : 'no')
        ;

-        if (method_exists($definition, 'isSynchronized')) {
-            $output .= "\n".'- Synchronized: '.($definition->isSynchronized(false) ? 'yes' : 'no');
-        }
-
        $output .= "\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no');

        if ($definition->getFile()) {
            $output .= "\n".'- File: `'.$definition->getFile().'`';
        }

-        if ($definition->getFactoryClass(false)) {
-            $output .= "\n".'- Factory Class: `'.$definition->getFactoryClass(false).'`';
-        }
-
-        if ($definition->getFactoryService(false)) {
-            $output .= "\n".'- Factory Service: `'.$definition->getFactoryService(false).'`';
-        }
-
-        if ($definition->getFactoryMethod(false)) {
-            $output .= "\n".'- Factory Method: `'.$definition->getFactoryMethod(false).'`';
-        }
-
        if ($factory = $definition->getFactory()) {
            if (is_array($factory)) {
                if ($factory[0] instanceof Reference) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -260,27 +260,12 @@ protected function describeContainerDefinition(Definition $definition, array $op
        $description[] = sprintf('<comment>Public</comment>           %s', $definition->isPublic() ? 'yes' : 'no');
        $description[] = sprintf('<comment>Synthetic</comment>        %s', $definition->isSynthetic() ? 'yes' : 'no');
        $description[] = sprintf('<comment>Lazy</comment>             %s', $definition->isLazy() ? 'yes' : 'no');
-        if (method_exists($definition, 'isSynchronized')) {
-            $description[] = sprintf('<comment>Synchronized</comment>     %s', $definition->isSynchronized(false) ? 'yes' : 'no');
-        }
        $description[] = sprintf('<comment>Abstract</comment>         %s', $definition->isAbstract() ? 'yes' : 'no');

        if ($definition->getFile()) {
            $description[] = sprintf('<comment>Required File</comment>    %s', $definition->getFile() ? $definition->getFile() : '-');
        }

-        if ($definition->getFactoryClass(false)) {
-            $description[] = sprintf('<comment>Factory Class</comment>    %s', $definition->getFactoryClass(false));
-        }
-
-        if ($definition->getFactoryService(false)) {
-            $description[] = sprintf('<comment>Factory Service</comment>  %s', $definition->getFactoryService(false));
-        }
-
-        if ($definition->getFactoryMethod(false)) {
-            $description[] = sprintf('<comment>Factory Method</comment>   %s', $definition->getFactoryMethod(false));
-        }
-
        if ($factory = $definition->getFactory()) {
            if (is_array($factory)) {
                if ($factory[0] instanceof Reference) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -329,20 +329,6 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu

        $serviceXML->setAttribute('class', $definition->getClass());

-        if (method_exists($definition, 'getFactoryMethod')) {
-            if ($definition->getFactoryClass(false)) {
-                $serviceXML->setAttribute('factory-class', $definition->getFactoryClass(false));
-            }
-
-            if ($definition->getFactoryService(false)) {
-                $serviceXML->setAttribute('factory-service', $definition->getFactoryService(false));
-            }
-
-            if ($definition->getFactoryMethod(false)) {
-                $serviceXML->setAttribute('factory-method', $definition->getFactoryMethod(false));
-            }
-        }
-
        if ($factory = $definition->getFactory()) {
            $serviceXML->appendChild($factoryXML = $dom->createElement('factory'));

@@ -364,9 +350,6 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
        $serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
        $serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
        $serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
-        if (method_exists($definition, 'isSynchronized')) {
-            $serviceXML->setAttribute('synchronized', $definition->isSynchronized(false) ? 'true' : 'false');
-        }
        $serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false');
        $serviceXML->setAttribute('file', $definition->getFile());


diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -66,24 +66,6 @@ public function getDescribeContainerBuilderTestData()
        return $this->getContainerBuilderDescriptionTestData(ObjectsProvider::getContainerBuilders());
    }

-    /**
-     * @dataProvider provideLegacySynchronizedServiceDefinitionTestData
-     * @group legacy
-     */
-    public function testLegacyDescribeSynchronizedServiceDefinition(Definition $definition, $expectedDescription)
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
-        $this->assertDescription($expectedDescription, $definition);
-    }
-
-    public function provideLegacySynchronizedServiceDefinitionTestData()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
-        return $this->getDescriptionTestData(ObjectsProvider::getLegacyContainerDefinitions());
-    }
-
    /** @dataProvider getDescribeContainerDefinitionTestData */
    public function testDescribeContainerDefinition(Definition $definition, $expectedDescription)
    {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php
@@ -112,39 +112,6 @@ public static function getContainerDefinitions()
        );
    }

-    /**
-     * @deprecated since version 2.7, to be removed in 3.0
-     * @internal
-     */
-    public static function getLegacyContainerDefinitions()
-    {
-        $definition1 = new Definition('Full\\Qualified\\Class1');
-        $definition2 = new Definition('Full\\Qualified\\Class2');
-
-        return array(
-            'legacy_synchronized_service_definition_1' => $definition1
-                ->setPublic(true)
-                ->setSynthetic(false)
-                ->setLazy(true)
-                ->setSynchronized(true)
-                ->setAbstract(true)
-                ->setFactoryClass('Full\\Qualified\\FactoryClass', 'get')
-                ->setFactoryMethod('get'),
-            'legacy_synchronized_service_definition_2' => $definition2
-                ->setPublic(false)
-                ->setSynthetic(true)
-                ->setFile('/path/to/file')
-                ->setLazy(false)
-                ->setSynchronized(false)
-                ->setAbstract(false)
-                ->addTag('tag1', array('attr1' => 'val1', 'attr2' => 'val2'))
-                ->addTag('tag1', array('attr3' => 'val3'))
-                ->addTag('tag2')
-                ->setFactoryService('factory.service')
-                ->setFactoryMethod('get'),
-        );
-    }
-
    public static function getContainerAliases()
    {
        return array(

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
@@ -6,7 +6,6 @@
            "public": true,
            "synthetic": false,
            "lazy": true,
-            "synchronized": false,
            "abstract": true,
            "file": null,
            "factory_class": "Full\\Qualified\\FactoryClass",

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
@@ -12,7 +12,6 @@ definition_1
 - Public: yes
 - Synthetic: no
 - Lazy: yes
- Synchronized: no
 - Abstract: yes
 - Factory Class: `Full\Qualified\FactoryClass`
 - Factory Method: `get`

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml
@@ -2,7 +2,7 @@
 <container>
  <alias id="alias_1" service="service_1" public="true"/>
  <alias id="alias_2" service="service_2" public="false"/>
-  <definition id="definition_1" class="Full\Qualified\Class1" scope="container" public="true" synthetic="false" lazy="true" synchronized="false" abstract="true" file="">
+  <definition id="definition_1" class="Full\Qualified\Class1" scope="container" public="true" synthetic="false" lazy="true" abstract="true" file="">
    <factory class="Full\Qualified\FactoryClass" method="get"/>
  </definition>
  <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerBuilder"/>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
@@ -6,7 +6,6 @@
            "public": true,
            "synthetic": false,
            "lazy": true,
-            "synchronized": false,
            "abstract": true,
            "file": null,
            "factory_class": "Full\\Qualified\\FactoryClass",
@@ -21,7 +20,6 @@
            "public": false,
            "synthetic": true,
            "lazy": false,
-            "synchronized": false,
            "abstract": false,
            "file": "\/path\/to\/file",
            "factory_service": "factory.service",

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
@@ -12,7 +12,6 @@ definition_1
 - Public: yes
 - Synthetic: no
 - Lazy: yes
- Synchronized: no
 - Abstract: yes
 - Factory Class: `Full\Qualified\FactoryClass`
 - Factory Method: `get`
@@ -25,7 +24,6 @@ definition_2
 - Public: no
 - Synthetic: yes
 - Lazy: no
- Synchronized: no
 - Abstract: no
 - File: `/path/to/file`
 - Factory Service: `factory.service`

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml
@@ -2,10 +2,10 @@
 <container>
  <alias id="alias_1" service="service_1" public="true"/>
  <alias id="alias_2" service="service_2" public="false"/>
-  <definition id="definition_1" class="Full\Qualified\Class1" scope="container" public="true" synthetic="false" lazy="true" synchronized="false" abstract="true" file="">
+  <definition id="definition_1" class="Full\Qualified\Class1" scope="container" public="true" synthetic="false" lazy="true" abstract="true" file="">
    <factory class="Full\Qualified\FactoryClass" method="get"/>
  </definition>
-  <definition id="definition_2" class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" synchronized="false" abstract="false" file="/path/to/file">
+  <definition id="definition_2" class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" abstract="false" file="/path/to/file">
    <factory service="factory.service" method="get"/>
    <tags>
      <tag name="tag1">

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
@@ -6,7 +6,6 @@
            "public": false,
            "synthetic": true,
            "lazy": false,
-            "synchronized": false,
            "abstract": false,
            "file": "\/path\/to\/file",
            "factory_service": "factory.service",

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md
@@ -12,7 +12,6 @@ definition_2
 - Public: no
 - Synthetic: yes
 - Lazy: no
- Synchronized: no
 - Abstract: no
 - File: `/path/to/file`
 - Factory Service: `factory.service`

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container>
-  <definition id="definition_2" class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" synchronized="false" abstract="false" file="/path/to/file">
+  <definition id="definition_2" class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" abstract="false" file="/path/to/file">
    <factory service="factory.service" method="get"/>
    <tags>
      <tag name="tag1">

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
@@ -6,7 +6,6 @@
            "public": false,
            "synthetic": true,
            "lazy": false,
-            "synchronized": false,
            "abstract": false,
            "file": "\/path\/to\/file",
            "factory_service": "factory.service",
@@ -20,7 +19,6 @@
            "public": false,
            "synthetic": true,
            "lazy": false,
-            "synchronized": false,
            "abstract": false,
            "file": "\/path\/to\/file",
            "factory_service": "factory.service",

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md
@@ -12,7 +12,6 @@ definition_2
 - Public: no
 - Synthetic: yes
 - Lazy: no
- Synchronized: no
 - Abstract: no
 - File: `/path/to/file`
 - Factory Service: `factory.service`
@@ -30,7 +29,6 @@ definition_2
 - Public: no
 - Synthetic: yes
 - Lazy: no
- Synchronized: no
 - Abstract: no
 - File: `/path/to/file`
 - Factory Service: `factory.service`

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container>
  <tag name="tag1">
-    <definition id="definition_2" class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" synchronized="false" abstract="false" file="/path/to/file">
+    <definition id="definition_2" class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" abstract="false" file="/path/to/file">
      <factory service="factory.service" method="get"/>
    </definition>
  </tag>
  <tag name="tag2">
-    <definition id="definition_2" class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" synchronized="false" abstract="false" file="/path/to/file">
+    <definition id="definition_2" class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" abstract="false" file="/path/to/file">
      <factory service="factory.service" method="get"/>
    </definition>
  </tag>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
@@ -4,7 +4,6 @@
    "public": true,
    "synthetic": false,
    "lazy": true,
-    "synchronized": false,
    "abstract": true,
    "file": null,
    "factory_class": "Full\\Qualified\\FactoryClass",

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md
@@ -3,7 +3,6 @@
 - Public: yes
 - Synthetic: no
 - Lazy: yes
- Synchronized: no
 - Abstract: yes
 - Factory Class: `Full\Qualified\FactoryClass`
 - Factory Method: `get`
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
@@ -5,7 +5,6 @@
 <comment>Public</comment>           yes
 <comment>Synthetic</comment>        no
 <comment>Lazy</comment>             yes
-<comment>Synchronized</comment>     no
 <comment>Abstract</comment>         yes
 <comment>Factory Class</comment>    Full\Qualified\FactoryClass
 <comment>Factory Method</comment>   get
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definition class="Full\Qualified\Class1" scope="container" public="true" synthetic="false" lazy="true" synchronized="false" abstract="true" file="">
+<definition class="Full\Qualified\Class1" scope="container" public="true" synthetic="false" lazy="true" abstract="true" file="">
  <factory class="Full\Qualified\FactoryClass" method="get"/>
 </definition>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
@@ -4,7 +4,6 @@
    "public": false,
    "synthetic": true,
    "lazy": false,
-    "synchronized": false,
    "abstract": false,
    "file": "\/path\/to\/file",
    "factory_service": "factory.service",

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md
@@ -3,7 +3,6 @@
 - Public: no
 - Synthetic: yes
 - Lazy: no
- Synchronized: no
 - Abstract: no
 - File: `/path/to/file`
 - Factory Service: `factory.service`

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
@@ -8,7 +8,6 @@
 <comment>Public</comment>           no
 <comment>Synthetic</comment>        yes
 <comment>Lazy</comment>             no
-<comment>Synchronized</comment>     no
 <comment>Abstract</comment>         no
 <comment>Required File</comment>    /path/to/file
 <comment>Factory Service</comment>  factory.service

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definition class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" synchronized="false" abstract="false" file="/path/to/file">
+<definition class="Full\Qualified\Class2" scope="container" public="false" synthetic="true" lazy="false" abstract="false" file="/path/to/file">
  <factory service="factory.service" method="get"/>
  <tags>
    <tag name="tag1">

diff --git a/...e/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json b/...e/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json