{
$this->mergePass = new MergeExtensionConfigurationPass();
- $this->optimizationPasses = array(
- new ExtensionCompilerPass(),
- new ResolveDefinitionTemplatesPass(),
+ $this->beforeOptimizationPasses = array(
+ 100 => array(
+ $resolveClassPass = new ResolveClassPass(),
+ new ResolveInstanceofConditionalsPass(),
+ new RegisterEnvVarProcessorsPass(),
+ ),
+ -1000 => array(new ExtensionCompilerPass()),
+ );
+
+ $this->optimizationPasses = array(array(
+ new ResolveChildDefinitionsPass(),
+ new ServiceLocatorTagPass(),
new DecoratorServicePass(),
- new ResolveParameterPlaceHoldersPass(),
+ new ResolveParameterPlaceHoldersPass(false),
+ new ResolveFactoryClassPass(),
+ new FactoryReturnTypePass($resolveClassPass),
new CheckDefinitionValidityPass(),
+ new RegisterServiceSubscribersPass(),
+ new ResolveNamedArgumentsPass(),
+ new AutowireRequiredMethodsPass(),
+ new ResolveBindingsPass(),
+ new AutowirePass(false),
+ new ResolveTaggedIteratorArgumentPass(),
+ new ResolveServiceSubscribersPass(),
new ResolveReferencesToAliasesPass(),
new ResolveInvalidReferencesPass(),
- new AutowirePass(),
new AnalyzeServiceReferencesPass(true),
new CheckCircularReferencesPass(),
new CheckReferenceValidityPass(),
+ new CheckArgumentsValidityPass(false),
+ ));
+
+ $this->beforeRemovingPasses = array(
+ -100 => array(
+ new ResolvePrivatesPass(),
+ ),
);
- $this->removingPasses = array(
+ $this->removingPasses = array(array(
new RemovePrivateAliasesPass(),
new ReplaceAliasByActualDefinitionPass(),
new RemoveAbstractDefinitionsPass(),
new AnalyzeServiceReferencesPass(),
new RemoveUnusedDefinitionsPass(),
)),
+ new DefinitionErrorExceptionPass(),
new CheckExceptionOnInvalidReferenceBehaviorPass(),
- );
+ new ResolveHotPathPass(),
+ ));
}
/**
* Returns all passes in order to be processed.
*
- * @return array An array of all passes to process
+ * @return CompilerPassInterface[]
*/
public function getPasses()
{
return array_merge(
array($this->mergePass),
- $this->beforeOptimizationPasses,
- $this->optimizationPasses,
- $this->beforeRemovingPasses,
- $this->removingPasses,
- $this->afterRemovingPasses
+ $this->getBeforeOptimizationPasses(),
+ $this->getOptimizationPasses(),
+ $this->getBeforeRemovingPasses(),
+ $this->getRemovingPasses(),
+ $this->getAfterRemovingPasses()
);
}
/**
* Adds a pass.
*
- * @param CompilerPassInterface $pass A Compiler pass
- * @param string $type The pass type
+ * @param CompilerPassInterface $pass A Compiler pass
+ * @param string $type The pass type
+ * @param int $priority Used to sort the passes
*
* @throws InvalidArgumentException when a pass type doesn't exist
*/
- public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_OPTIMIZATION)
+ public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_OPTIMIZATION/*, int $priority = 0*/)
{
+ if (func_num_args() >= 3) {
+ $priority = func_get_arg(2);
+ } else {
+ if (__CLASS__ !== get_class($this)) {
+ $r = new \ReflectionMethod($this, __FUNCTION__);
+ if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
+ @trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since Symfony 3.2.', __METHOD__), E_USER_DEPRECATED);
+ }
+ }
+
+ $priority = 0;
+ }
+
$property = $type.'Passes';
if (!isset($this->$property)) {
throw new InvalidArgumentException(sprintf('Invalid type "%s".', $type));
}
- $this->{$property}[] = $pass;
+ $passes = &$this->$property;
+
+ if (!isset($passes[$priority])) {
+ $passes[$priority] = array();
+ }
+ $passes[$priority][] = $pass;
}
/**
* Gets all passes for the AfterRemoving pass.
*
- * @return array An array of passes
+ * @return CompilerPassInterface[]
*/
public function getAfterRemovingPasses()
{
- return $this->afterRemovingPasses;
+ return $this->sortPasses($this->afterRemovingPasses);
}
/**
* Gets all passes for the BeforeOptimization pass.
*
- * @return array An array of passes
+ * @return CompilerPassInterface[]
*/
public function getBeforeOptimizationPasses()
{
- return $this->beforeOptimizationPasses;
+ return $this->sortPasses($this->beforeOptimizationPasses);
}
/**
* Gets all passes for the BeforeRemoving pass.
*
- * @return array An array of passes
+ * @return CompilerPassInterface[]
*/
public function getBeforeRemovingPasses()
{
- return $this->beforeRemovingPasses;
+ return $this->sortPasses($this->beforeRemovingPasses);
}
/**
* Gets all passes for the Optimization pass.
*
- * @return array An array of passes
+ * @return CompilerPassInterface[]
*/
public function getOptimizationPasses()
{
- return $this->optimizationPasses;
+ return $this->sortPasses($this->optimizationPasses);
}
/**
* Gets all passes for the Removing pass.
*
- * @return array An array of passes
+ * @return CompilerPassInterface[]
*/
public function getRemovingPasses()
{
- return $this->removingPasses;
+ return $this->sortPasses($this->removingPasses);
}
/**
* Gets the Merge pass.
*
- * @return CompilerPassInterface The merge pass
+ * @return CompilerPassInterface
*/
public function getMergePass()
{
return $this->mergePass;
}
- /**
- * Sets the Merge Pass.
- *
- * @param CompilerPassInterface $pass The merge pass
- */
public function setMergePass(CompilerPassInterface $pass)
{
$this->mergePass = $pass;
/**
* Sets the AfterRemoving passes.
*
- * @param array $passes An array of passes
+ * @param CompilerPassInterface[] $passes
*/
public function setAfterRemovingPasses(array $passes)
{
- $this->afterRemovingPasses = $passes;
+ $this->afterRemovingPasses = array($passes);
}
/**
* Sets the BeforeOptimization passes.
*
- * @param array $passes An array of passes
+ * @param CompilerPassInterface[] $passes
*/
public function setBeforeOptimizationPasses(array $passes)
{
- $this->beforeOptimizationPasses = $passes;
+ $this->beforeOptimizationPasses = array($passes);
}
/**
* Sets the BeforeRemoving passes.
*
- * @param array $passes An array of passes
+ * @param CompilerPassInterface[] $passes
*/
public function setBeforeRemovingPasses(array $passes)
{
- $this->beforeRemovingPasses = $passes;
+ $this->beforeRemovingPasses = array($passes);
}
/**
* Sets the Optimization passes.
*
- * @param array $passes An array of passes
+ * @param CompilerPassInterface[] $passes
*/
public function setOptimizationPasses(array $passes)
{
- $this->optimizationPasses = $passes;
+ $this->optimizationPasses = array($passes);
}
/**
* Sets the Removing passes.
*
- * @param array $passes An array of passes
+ * @param CompilerPassInterface[] $passes
*/
public function setRemovingPasses(array $passes)
{
- $this->removingPasses = $passes;
+ $this->removingPasses = array($passes);
+ }
+
+ /**
+ * Sort passes by priority.
+ *
+ * @param array $passes CompilerPassInterface instances with their priority as key
+ *
+ * @return CompilerPassInterface[]
+ */
+ private function sortPasses(array $passes)
+ {
+ if (0 === count($passes)) {
+ return array();
+ }
+
+ krsort($passes);
+
+ // Flatten the array
+ return call_user_func_array('array_merge', $passes);
}
}
projects / yaffs-website / blobdiff