Skip to content

Commit

Permalink
fixed CS (mainly method signatures)
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Jul 9, 2012
1 parent 6a06a62 commit c3a940d
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Compiler/CompilerPassInterface.php
Expand Up @@ -31,5 +31,5 @@ interface CompilerPassInterface
*
* @api
*/
function process(ContainerBuilder $container);
public function process(ContainerBuilder $container);
}
1 change: 0 additions & 1 deletion Compiler/LoggingFormatter.php
Expand Up @@ -11,7 +11,6 @@

namespace Symfony\Component\DependencyInjection\Compiler;


/**
* Used to format logging messages during the compilation.
*
Expand Down
2 changes: 1 addition & 1 deletion Compiler/RepeatablePassInterface.php
Expand Up @@ -24,5 +24,5 @@ interface RepeatablePassInterface extends CompilerPassInterface
*
* @param RepeatedPass $repeatedPass
*/
function setRepeatedPass(RepeatedPass $repeatedPass);
public function setRepeatedPass(RepeatedPass $repeatedPass);
}
4 changes: 2 additions & 2 deletions Container.php
Expand Up @@ -440,7 +440,7 @@ public function isScopeActive($name)
*
* @return string The camelized string
*/
static public function camelize($id)
public static function camelize($id)
{
return preg_replace_callback('/(^|_|\.)+(.)/', function ($match) { return ('.' === $match[1] ? '_' : '').strtoupper($match[2]); }, $id);
}
Expand All @@ -452,7 +452,7 @@ static public function camelize($id)
*
* @return string The underscored string
*/
static public function underscore($id)
public static function underscore($id)
{
return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($id, '_', '.')));
}
Expand Down
2 changes: 1 addition & 1 deletion ContainerAwareInterface.php
Expand Up @@ -27,5 +27,5 @@ interface ContainerAwareInterface
*
* @api
*/
function setContainer(ContainerInterface $container = null);
public function setContainer(ContainerInterface $container = null);
}
2 changes: 1 addition & 1 deletion ContainerBuilder.php
Expand Up @@ -837,7 +837,7 @@ public function findTaggedServiceIds($name)
*
* @return array An array of Service conditionals
*/
static public function getServiceConditionals($value)
public static function getServiceConditionals($value)
{
$services = array();

Expand Down
22 changes: 11 additions & 11 deletions ContainerInterface.php
Expand Up @@ -36,7 +36,7 @@ interface ContainerInterface
*
* @api
*/
function set($id, $service, $scope = self::SCOPE_CONTAINER);
public function set($id, $service, $scope = self::SCOPE_CONTAINER);

/**
* Gets a service.
Expand All @@ -52,7 +52,7 @@ function set($id, $service, $scope = self::SCOPE_CONTAINER);
*
* @api
*/
function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);

/**
* Returns true if the given service is defined.
Expand All @@ -63,7 +63,7 @@ function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
*
* @api
*/
function has($id);
public function has($id);

/**
* Gets a parameter.
Expand All @@ -76,7 +76,7 @@ function has($id);
*
* @api
*/
function getParameter($name);
public function getParameter($name);

/**
* Checks if a parameter exists.
Expand All @@ -87,7 +87,7 @@ function getParameter($name);
*
* @api
*/
function hasParameter($name);
public function hasParameter($name);

/**
* Sets a parameter.
Expand All @@ -97,7 +97,7 @@ function hasParameter($name);
*
* @api
*/
function setParameter($name, $value);
public function setParameter($name, $value);

/**
* Enters the given scope
Expand All @@ -108,7 +108,7 @@ function setParameter($name, $value);
*
* @api
*/
function enterScope($name);
public function enterScope($name);

/**
* Leaves the current scope, and re-enters the parent scope
Expand All @@ -119,7 +119,7 @@ function enterScope($name);
*
* @api
*/
function leaveScope($name);
public function leaveScope($name);

/**
* Adds a scope to the container
Expand All @@ -130,7 +130,7 @@ function leaveScope($name);
*
* @api
*/
function addScope(ScopeInterface $scope);
public function addScope(ScopeInterface $scope);

/**
* Whether this container has the given scope
Expand All @@ -141,7 +141,7 @@ function addScope(ScopeInterface $scope);
*
* @api
*/
function hasScope($name);
public function hasScope($name);

/**
* Determines whether the given scope is currently active.
Expand All @@ -154,5 +154,5 @@ function hasScope($name);
*
* @api
*/
function isScopeActive($name);
public function isScopeActive($name);
}
2 changes: 1 addition & 1 deletion Dumper/DumperInterface.php
Expand Up @@ -29,5 +29,5 @@ interface DumperInterface
*
* @api
*/
function dump(array $options = array());
public function dump(array $options = array());
}
2 changes: 1 addition & 1 deletion Dumper/XmlDumper.php
Expand Up @@ -294,7 +294,7 @@ private function escape($arguments)
*
* @throws \RuntimeException When trying to dump object or resource
*/
static public function phpToXml($value)
public static function phpToXml($value)
{
switch (true) {
case null === $value:
Expand Down
8 changes: 4 additions & 4 deletions Extension/ExtensionInterface.php
Expand Up @@ -32,7 +32,7 @@ interface ExtensionInterface
*
* @api
*/
function load(array $config, ContainerBuilder $container);
public function load(array $config, ContainerBuilder $container);

/**
* Returns the namespace to be used for this extension (XML namespace).
Expand All @@ -41,7 +41,7 @@ function load(array $config, ContainerBuilder $container);
*
* @api
*/
function getNamespace();
public function getNamespace();

/**
* Returns the base path for the XSD files.
Expand All @@ -50,7 +50,7 @@ function getNamespace();
*
* @api
*/
function getXsdValidationBasePath();
public function getXsdValidationBasePath();

/**
* Returns the recommended alias to use in XML.
Expand All @@ -61,5 +61,5 @@ function getXsdValidationBasePath();
*
* @api
*/
function getAlias();
public function getAlias();
}
2 changes: 1 addition & 1 deletion Loader/XmlFileLoader.php
Expand Up @@ -467,7 +467,7 @@ private function loadFromExtensions(SimpleXMLElement $xml)
*
* @return array A PHP array
*/
static public function convertDomElementToArray(\DomElement $element)
public static function convertDomElementToArray(\DomElement $element)
{
$empty = true;
$config = array();
Expand Down
16 changes: 8 additions & 8 deletions ParameterBag/ParameterBagInterface.php
Expand Up @@ -27,7 +27,7 @@ interface ParameterBagInterface
*
* @api
*/
function clear();
public function clear();

/**
* Adds parameters to the service container parameters.
Expand All @@ -36,7 +36,7 @@ function clear();
*
* @api
*/
function add(array $parameters);
public function add(array $parameters);

/**
* Gets the service container parameters.
Expand All @@ -45,7 +45,7 @@ function add(array $parameters);
*
* @api
*/
function all();
public function all();

/**
* Gets a service container parameter.
Expand All @@ -58,7 +58,7 @@ function all();
*
* @api
*/
function get($name);
public function get($name);

/**
* Sets a service container parameter.
Expand All @@ -68,7 +68,7 @@ function get($name);
*
* @api
*/
function set($name, $value);
public function set($name, $value);

/**
* Returns true if a parameter name is defined.
Expand All @@ -79,12 +79,12 @@ function set($name, $value);
*
* @api
*/
function has($name);
public function has($name);

/**
* Replaces parameter placeholders (%name%) by their values for all parameters.
*/
function resolve();
public function resolve();

/**
* Replaces parameter placeholders (%name%) by their values.
Expand All @@ -93,5 +93,5 @@ function resolve();
*
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
*/
function resolveValue($value);
public function resolveValue($value);
}
4 changes: 2 additions & 2 deletions ScopeInterface.php
Expand Up @@ -23,10 +23,10 @@ interface ScopeInterface
/**
* @api
*/
function getName();
public function getName();

/**
* @api
*/
function getParentName();
public function getParentName();
}
2 changes: 1 addition & 1 deletion SimpleXMLElement.php
Expand Up @@ -99,7 +99,7 @@ public function getArgumentsAsPhp($name, $lowercase = true)
*
* @return mixed
*/
static public function phpize($value)
public static function phpize($value)
{
$value = (string) $value;
$lowercaseValue = strtolower($value);
Expand Down
2 changes: 1 addition & 1 deletion TaggedContainerInterface.php
Expand Up @@ -29,5 +29,5 @@ interface TaggedContainerInterface extends ContainerInterface
*
* @api
*/
function findTaggedServiceIds($name);
public function findTaggedServiceIds($name);
}

0 comments on commit c3a940d

Please sign in to comment.