← Back to branch summary

~ubuntu-branches/ubuntu/wily/symfony/wily

« back to all changes in this revision

Viewing changes to src/Symfony/Component/DependencyInjection/ContainerBuilder.php

  • Committer: Package Import Robot
  • Author(s): David Prévot, Fabien Potencier
  • Date: 2015-06-14 17:15:34 UTC
  • mfrom: (1.3.3)
  • Revision ID: package-import@ubuntu.com-20150614171534-h74z7c7x7hdhz3ra
Tags: 2.7.1+dfsg-1
[ Fabien Potencier ]
updated VERSION for 2.7.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
982
982
 
983
983
        if ($callable = $definition->getConfigurator()) {
984
984
            if (is_array($callable)) {
985
 
                $callable[0] = $callable[0] instanceof Reference ? $this->get((string) $callable[0]) : $parameterBag->resolveValue($callable[0]);
 
985
                $callable[0] = $parameterBag->resolveValue($callable[0]);
 
986
 
 
987
                if ($callable[0] instanceof Reference) {
 
988
                    $callable[0] = $this->get((string) $callable[0], $callable[0]->getInvalidBehavior());
 
989
                } elseif ($callable[0] instanceof Definition) {
 
990
                    $callable[0] = $this->createService($callable[0], null);
 
991
                }
986
992
            }
987
993
 
988
994
            if (!is_callable($callable)) {
1127
1133
    private function synchronize($id)
1128
1134
    {
1129
1135
        if ('request' !== $id) {
1130
 
            trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
 
1136
            @trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
1131
1137
        }
1132
1138
 
1133
1139
        foreach ($this->definitions as $definitionId => $definition) {