symfony · Ocramius · Jan 29, 2016 · Feb 22, 2016 · Dec 5, 2015 · Feb 23, 2016
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,6 @@
 | Q             | A
 | ------------- | ---
+| Branch        | master for features and deprecations / lowest applicable and maintained version otherwise
 | Bug fix?      | yes/no
 | New feature?  | yes/no
 | BC breaks?    | yes/no

diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,9 @@ language: php
 
 sudo: false
 
+git:
+    depth: 1
+
 addons:
     apt_packages:
         - parallel

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,16 +5,20 @@ Symfony is an open source, community-driven project.
 
 If you'd like to contribute, please read the following documents:
 
-* [Contributing Code][1]: The document index related to contributions;
+* [Reporting a Bug][1]
+* [Submitting a Patch][2]
+* [Symfony Core Team][3]
+* [Security Issues][4]
+* [Running Symfony Tests][5]
+* [Our Backwards Compatibility Promise][6]
+* [Coding Standards][7]
+* [Conventions][8]
 
-* [Submitting a Patch][2]: Guidelines for submitting a pull request;
-
-* [Pull Request Template][3]: Template header to use in your pull request
-  description;
-
-* [Backwards Compatibility][4]: Backward compatibility rules.
-
-[1]: https://symfony.com/doc/current/contributing/code/index.html
-[2]: https://symfony.com/doc/current/contributing/code/patches.html#check-list
-[3]: https://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
-[4]: https://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code
+[1]: https://symfony.com/doc/current/contributing/code/bugs.html
+[2]: https://symfony.com/doc/current/contributing/code/patches.html
+[3]: https://symfony.com/doc/current/contributing/code/core_team.html
+[4]: https://symfony.com/doc/current/contributing/code/security.html
+[5]: https://symfony.com/doc/current/contributing/code/tests.html
+[6]: https://symfony.com/doc/current/contributing/code/bc.html
+[7]: https://symfony.com/doc/current/contributing/code/standards.html
+[8]: https://symfony.com/doc/current/contributing/code/conventions.html
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,5 @@
 build: false
-shallow_clone: true
-platform: x86
+clone_depth: 1
 clone_folder: c:\projects\symfony
 
 cache:

diff --git a/composer.json b/composer.json
@@ -69,10 +69,17 @@
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
         "doctrine/orm": "~2.4,>=2.4.5",
-        "monolog/monolog": "~1.3",
-        &
67E6
quot;propel/propel1": "~1.6",
-        "ircmaxell/password-compat": "~1.0",
-        "ocramius/proxy-manager": "~0.3.1"
+        "doctrine/doctrine-bundle": "~1.4",
+        "monolog/monolog": "~1.11",
+        "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
+        "egulias/email-validator": "~1.2",
+        "symfony/polyfill-apcu": "~1.1",
+        "symfony/security-acl": "~2.8|~3.0",
+        "ocramius/proxy-manager": "~0.3.1|~1.0|~2.0",
+        "phpdocumentor/reflection": "^1.0.7"
+    },
+    "conflict": {
+        "phpdocumentor/reflection": "<1.0.7"
     },
     "autoload": {
         "psr-0": { "Symfony\\": "src/" },

diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -77,11 +77,17 @@ public function getProxyFactoryCode(Definition $definition, $id)
         $methodName = 'get'.Container::camelize($id).'Service';
         $proxyClass = $this->getProxyClassName($definition);
 
+        $generatedClass = $this->generateProxyClass($definition);
+
+        $constructorCall = $generatedClass->hasMethod('staticProxyConstructor')
+            ? $proxyClass.'::staticProxyConstructor'
+            : 'new '.$proxyClass;
+
         return <<<EOF
         if (\$lazyLoad) {
             \$container = \$this;
 
-            $instantiation new $proxyClass(
+            $instantiation $constructorCall(
                 function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy) use (\$container) {
                     \$wrappedInstance = \$container->$methodName(false);
 
@@ -101,11 +107,7 @@ function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy)
      */
     public function getProxyCode(Definition $definition)
     {
-        $generatedClass = new ClassGenerator($this->getProxyClassName($definition));
-
-        $this->proxyGenerator->generate(new \ReflectionClass($definition->getClass()), $generatedClass);
-
-        return $this->classGenerator->generate($generatedClass);
+        return $this->classGenerator->generate($this->generateProxyClass($definition));
     }
 
     /**
@@ -119,4 +121,18 @@ private function getProxyClassName(Definition $definition)
     {
         return str_replace('\\', '', $definition->getClass()).'_'.spl_object_hash($definition).$this->salt;
     }
+
+    /**
+     * @param Definition $definition
+     *
+     * @return ClassGenerator
+     */
+    private function generateProxyClass(Definition $definition)
+    {
+        $generatedClass = new ClassGenerator($this->getProxyClassName($definition));
+
+        $this->proxyGenerator->generate(new \ReflectionClass($definition->getClass()), $generatedClass);
+
+        return $generatedClass;
+    }
 }
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Dumper/PhpDumperTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper;
 
+use ProxyManager\ProxyGenerator\LazyLoading\MethodGenerator\StaticProxyConstructor;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -49,7 +50,11 @@ public function testDumpContainerWithProxyService()
      */
     public function testDumpContainerWithProxyServiceWillShareProxies()
     {
-        require_once __DIR__.'/../Fixtures/php/lazy_service.php';
+        if (class_exists(StaticProxyConstructor::class)) { // detecting ProxyManager v2
+            require_once __DIR__.'/../Fixtures/php/lazy_service_with_hints.php';
+        } else {
+            require_once __DIR__.'/../Fixtures/php/lazy_service.php';
+        }
 
         $container = new \LazyServiceProjectServiceContainer();
 

diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
@@ -8,7 +8,7 @@ class ProjectServiceContainer extends Container
         if ($lazyLoad) {
             $container = $this;
 
-            return $this->services['foo'] = new stdClass_%s(
+            return $this->services['foo'] =%sstdClass_%s(
                 function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {
                     $wrappedInstance = $container->getFooService(false);
 
@@ -23,5 +23,5 @@ class ProjectServiceContainer extends Container
     }
 }
 
-class stdClass_%s extends \stdClass implements \ProxyManager\Proxy\LazyLoadingInterface, \ProxyManager\Proxy\ValueHolderInterface
+class stdClass_%s extends \stdClass implements \ProxyManager\%s
 {%a}%A
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php
@@ -0,0 +1,189 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Parameter;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * ProjectServiceContainer.
+ *
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ */
+class LazyServiceProjectServiceContainer extends Container
+{
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->services = array();
+    }
+
+    /**
+     * Gets the 'foo' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @param bool $lazyLoad whether to try lazy-loading the service with a proxy
+     *
+     * @return stdClass A stdClass instance.
+     */
+    public function getFooService($lazyLoad = true)
+    {
+        if ($lazyLoad) {
+            $container = $this;
+
+            return $this->services['foo'] = new stdClass_c1d194250ee2e2b7d2eab8b8212368a8(
+                function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {
+                    $wrappedInstance = $this->getFooService(false);
+
+                    $proxy->setProxyInitializer(null);
+
+                    return true;
+                }
+            );
+        }
+
+        return new \stdClass();
+    }
+}
+
+class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \ProxyManager\Proxy\LazyLoadingInterface, \ProxyManager\Proxy\ValueHolderInterface
+{
+    /**
+     * @var \Closure|null initializer responsible for generating the wrapped object
+     */
+    private $valueHolder5157dd96e88c0 = null;
+
+    /**
+     * @var \Closure|null initializer responsible for generating the wrapped object
+     */
+    private $initializer5157dd96e8924 = null;
+
+    /**
+     * @override constructor for lazy initialization
+     *
+     * @param \Closure|null $initializer
+     */
+    public function __construct($initializer)
+    {
+        $this->initializer5157dd96e8924 = $initializer;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function __get($name)
+    {
+        $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__get', array('name' => $name));
+
+        return $this->valueHolder5157dd96e88c0->$name;
+    }
+
+    /**
+     * @param string $name
+     * @param mixed  $value
+     */
+    public function __set($name, $value)
+    {
+        $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__set', array('name' => $name, 'value' => $value));
+
+        $this->valueHolder5157dd96e88c0->$name = $value;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function __isset($name)
+    {
+        $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__isset', array('name' => $name));
+
+        return isset($this->valueHolder5157dd96e88c0->$name);
+    }
+
+    /**
+     * @param string $name
+     */
+    public function __unset($name)
+    {
+        $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__unset', array('name' => $name));
+
+        unset($this->valueHolder5157dd96e88c0->$name);
+    }
+
+    /**
+     *
+     */
+    public function __clone()
+    {
+        $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());
+
+        $this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;
+    }
+
+    /**
+     *
+     */
+    public function __sleep()
+    {
+        $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());
+
+        return array('valueHolder5157dd96e88c0');
+    }
+
+    /**
+     *
+     */
+    public function __wakeup()
+    {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setProxyInitializer(\Closure $initializer = null)
+    {
+        $this->initializer5157dd96e8924 = $initializer;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProxyInitializer()
+    {
+        return $this->initializer5157dd96e8924;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function initializeProxy() : bool
+    {
+        return $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, 'initializeProxy', array());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isProxyInitialized() : bool
+    {
+        return null !== $this->valueHolder5157dd96e88c0;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getWrappedValueHolderValue()
+    {
+        return $this->valueHolder5157dd96e88c0;
+    }
+}
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -69,7 +69,7 @@ public function testGetProxyFactoryCode()
         $code = $this->dumper->getProxyFactoryCode($definition, 'foo');
 
         $this->assertStringMatchesFormat(
-            '%wif ($lazyLoad) {%w$container = $this;%wreturn $this->services[\'foo\'] = new '
+            '%wif ($lazyLoad) {%w$container = $this;%wreturn $this->services[\'foo\'] =%s'
             .'SymfonyBridgeProxyManagerTestsLazyProxyPhpDumperProxyDumperTest_%s(%wfunction '
             .'(&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {'
             .'%w$wrappedInstance = $container->getFooService(false);%w$proxy->setProxyInitializer(null);'

diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/dependency-injection": "~2.3",
-        "ocramius/proxy-manager": "~0.3.1"
+        "ocramius/proxy-manager": "~0.3.1|~1.0|~2.0"
     },
     "require-dev": {
         "symfony/config": "~2.3"

diff --git a/...mfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddConstraintValidatorsPass.php b/...mfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddConstraintValidatorsPass.php
@@ -27,6 +27,8 @@ public function process(ContainerBuilder $container)
             if (isset($attributes[0]['alias'])) {
                 $validators[$attributes[0]['alias']] = $id;
             }
+
+            $validators[$container->getDefinition($id)->getClass()] = $id;
         }
 
         $container->getDefinition('validator.validator_factory')->replaceArgument(1, $validators);