symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
Lines changed: 89 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
Lines changed: 89 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/AliasConfigurator.php
Lines changed: 52 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/AliasConfigurator.php
Lines changed: 52 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/ChildConfigurator.php
Lines changed: 98 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/ChildConfigurator.php
Lines changed: 98 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/DefaultsConfigurator.php
Lines changed: 34 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/DefaultsConfigurator.php
Lines changed: 34 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/InlineConfigurator.php
Lines changed: 49 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/InlineConfigurator.php
Lines changed: 49 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/InstanceofConfigurator.php
Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader/InstanceofConfigurator.php
Lines changed: 20 additions & 0 deletions
@@ -73,7 +73,7 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
      * @param string     $id
      * @param Definition $definition
      */
-    protected function setDefinition($id, Definition $definition)
+    public function setDefinition($id, Definition $definition)
     {
         if ($this->isLoadingInstanceof) {
             if (!$definition instanceof ChildDefinition) {
 
@@ -11,7 +11,17 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\FileResource;
+require_once __DIR__.'/PhpFileLoader/functions.php';
+
+use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader\InlineConfigurator;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader\Internal\AbstractRootConfigurator;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader\ReferenceConfigurator;
+use Symfony\Component\DependencyInjection\Parameter;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\ExpressionLanguage\Expression;
 
 /**
  * PhpFileLoader loads service definitions from a PHP file.
@@ -23,6 +33,8 @@
  */
 class PhpFileLoader extends FileLoader
 {
+    private $defaults;
+
     /**
      * {@inheritdoc}
      */
@@ -35,6 +47,8 @@ public function load($resource, $type = null)
         $path = $this->locator->locate($resource);
         $this->setCurrentDir(dirname($path));
         $this->container->fileExists($path);
+        $this->defaults = new Definition();
+        $this->instanceof = array();
 
         include $path;
     }
@@ -54,4 +68,78 @@ public function supports($resource, $type = null)
 
         return 'php' === $type;
     }
+
+    /**
+     * @internal
+     */
+    public static function call(\Closure $callback)
+    {
+        $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS, 4);
+        if (!isset($trace[3]['object']) || !$trace[3]['object'] instanceof self) {
+            throw new \ErrorException(sprintf('Function "%s()" must be called in a "%s" context.', $trace[1]['function'], __CLASS__), 0, E_ERROR, $trace[1]['file'], $trace[1]['line']);
+        }
+        $callback = $callback->bindTo($trace[3]['object'], __CLASS__);
+
+        return $callback($trace[3]['object']->defaults, $trace[1]['file']);
+    }
+
+    /**
+     * @internal
+     */
+    public static function processValue($value)
+    {
+        if (is_array($value)) {
+            foreach ($value as $k => $v) {
+                $value[$k] = self::processValue($v);
+            }
+
+            return $value;
+        }
+
+        if ($value instanceof ReferenceConfigurator) {
+            static $refCast;
+
+            if (!$refCast) {
+                $refCast = \Closure::bind(function ($value) {
+                    return new Reference($value->id, $value->invalidBehavior);
+                }, $value, $value);
+            }
+
+            // cast ReferenceConfigurator to Reference
+            return $refCast($value);
+        }
+
+        if ($value instanceof InlineConfigurator) {
+            static $defCast;
+
+            if (!$defCast) {
+                $defCast = \Closure::bind(function ($value) {
+                    $def = $value->definition;
+                    $value->definition = null;
+
+                    return $def;
+                }, $value, $value);
+            }
+
+            // cast InlineConfigurator to Definition
+            return $defCast($value);
+        }
+
+        if ($value instanceof AbstractRootConfigurator) {
+            throw new InvalidArgumentException(sprintf('"%s()" can be used only at the root of service configuration files.', $value::FACTORY));
+        }
+
+        switch (true) {
+            case null === $value:
+            case is_scalar($value):
+            case $value instanceof ArgumentInterface:
+            case $value instanceof Definition:
+            case $value instanceof Expression:
+            case $value instanceof Parameter:
+            case $value instanceof Reference:
+                return $value;
+        }
+
+        throw new InvalidArgumentException(sprintf('Cannot use values of type "%s" in service configuration files.', is_object($value) ? get_class($value) : gettype($value)));
+    }
 }
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+use Symfony\Component\DependencyInjection\Alias;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @method $this public()
+ * @method $this private()
+ */
+class AliasConfigurator extends Internal\AbstractRootConfigurator
+{
+    const FACTORY = 'alias';
+
+    private $alias;
+
+    public function __construct(Alias $alias)
+    {
+        $this->alias = $alias;
+    }
+
+    /**
+     * @return $this
+     */
+    protected function setPublic()
+    {
+        $this->alias->setPublic(true);
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    protected function setPrivate()
+    {
+        $this->alias->setPublic(false);
+
+        return $this;
+    }
+}
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @method $this class()
+ * @method $this parent()
+ */
+class ChildConfigurator extends Internal\AbstractPrototypeConfigurator
+{
+    const FACTORY = 'service';
+
+    /**
+     * Sets the Definition being decorated.
+     *
+     * @param string $parent
+     *
+     * @return $this
+     */
+    protected function setParent($parent)
+    {
+        $this->definition->setParent($parent);
+
+        return $this;
+    }
+
+    /**
+     * Sets the service that this service is decorating.
+     *
+     * @param null|string $id        The decorated service id, use null to remove decoration
+     * @param null|string $renamedId The new decorated service id
+     * @param int         $priority  The priority of decoration
+     *
+     * @return $this
+     *
+     * @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals.
+     */
+    public function decorate($id, $renamedId = null, $priority = 0)
+    {
+        $this->definition->setDecoratedService($id, $renamedId, $priority);
+
+        return $this;
+    }
+
+    /**
+     * Sets the service class.
+     *
+     * @param string $class The service class
+     *
+     * @return $this
+     */
+    protected function setClass($class)
+    {
+        $this->definition->setClass($class);
+
+        return $this;
+    }
+
+    /**
+     * Sets a file to require before creating the service.
+     *
+     * @param string $file A full pathname to include
+     *
+     * @return $this
+     */
+    public function file($file)
+    {
+        $this->definition->setFile($file);
+
+        return $this;
+    }
+
+    /**
+     * Sets whether this definition is synthetic, that is not constructed by the
+     * container, but dynamically injected.
+     *
+     * @param bool $synthetic
+     *
+     * @return $this
+     */
+    public function synthetic($synthetic = true)
+    {
+        $this->definition->setSynthetic($synthetic);
+
+        return $this;
+    }
+}
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DefaultsConfigurator extends Internal\AbstractDefaultsConfigurator
+{
+    const FACTORY = '_defaults';
+
+    use Internal\BindTrait;
+
+    /**
+     * Sets whether or not instanceof conditionals should be prepended with a global set.
+     *
+     * @return $this
+     */
+    public function autoconfigure($autoconfigured = true)
+    {
+        $this->definition->setAutoconfigured($autoconfigured);
+
+        return $this;
+    }
+}
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Definition;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class InlineConfigurator extends ChildConfigurator
+{
+    use Internal\BindTrait;
+
+    public function __construct($class)
+    {
+        $this->definition = new Definition();
+        $this->definition->setPublic(false);
+        $this->definition->setClass($class);
+    }
+
+    /**
+     * Sets the Definition to inherit from.
+     *
+     * @param string $parent
+     *
+     * @return ChildConfigurator
+     */
+    protected function setParent($parent)
+    {
+        // cast Definition to ChildDefinition
+        $definition = serialize($this->definition);
+        $definition = substr_replace($definition, '53', 2, 2);
+        $definition = substr_replace($definition, 'Child', 44, 0);
+        $definition = unserialize($definition);
+        $definition->setParent($parent);
+
+        return new ChildConfigurator(null, $this->definition = $definition, $this->defaultTags);
+    }
+}
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class InstanceofConfigurator extends Internal\AbstractInstanceofConfigurator
+{
+    const FACTORY = '_instanceof';
+}