Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed CS

  • Loading branch information...
commit 803f11bdfd4730da01221b5ecb6a935a5f9b6bff 1 parent 1ea9c13
@fabpot fabpot authored
Showing with 60 additions and 62 deletions.
  1. +1 −1  Compiler/CompilerPassInterface.php
  2. +0 −1  Compiler/LoggingFormatter.php
  3. +1 −1  Compiler/RepeatablePassInterface.php
  4. +2 −2 Container.php
  5. +1 −1  ContainerAwareInterface.php
  6. +1 −1  ContainerBuilder.php
  7. +11 −11 ContainerInterface.php
  8. +1 −1  Dumper/DumperInterface.php
  9. +1 −1  Dumper/XmlDumper.php
  10. +1 −1  Extension/ConfigurationExtensionInterface.php
  11. +4 −4 Extension/ExtensionInterface.php
  12. +1 −1  IntrospectableContainerInterface.php
  13. +1 −1  Loader/XmlFileLoader.php
  14. +10 −10 ParameterBag/ParameterBagInterface.php
  15. +2 −2 ScopeInterface.php
  16. +1 −1  SimpleXMLElement.php
  17. +1 −1  TaggedContainerInterface.php
  18. +0 −1  Tests/ContainerBuilderTest.php
  19. +2 −2 Tests/CrossCheckTest.php
  20. +2 −2 Tests/Dumper/GraphvizDumperTest.php
  21. +2 −2 Tests/Dumper/PhpDumperTest.php
  22. +2 −2 Tests/Dumper/XmlDumperTest.php
  23. +2 −2 Tests/Dumper/YamlDumperTest.php
  24. +3 −3 Tests/Fixtures/includes/classes.php
  25. +1 −1  Tests/Fixtures/includes/foo.php
  26. +2 −2 Tests/Loader/IniFileLoaderTest.php
  27. +2 −2 Tests/Loader/XmlFileLoaderTest.php
  28. +2 −2 Tests/Loader/YamlFileLoaderTest.php
View
2  Compiler/CompilerPassInterface.php
@@ -29,5 +29,5 @@
*
* @api
*/
- function process(ContainerBuilder $container);
+ public function process(ContainerBuilder $container);
}
View
1  Compiler/LoggingFormatter.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\DependencyInjection\Compiler;
-
/**
* Used to format logging messages during the compilation.
*
View
2  Compiler/RepeatablePassInterface.php
@@ -24,5 +24,5 @@
*
* @param RepeatedPass $repeatedPass
*/
- function setRepeatedPass(RepeatedPass $repeatedPass);
+ public function setRepeatedPass(RepeatedPass $repeatedPass);
}
View
4 Container.php
@@ -448,7 +448,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);
}
@@ -460,7 +460,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, '_', '.')));
}
View
2  ContainerAwareInterface.php
@@ -27,5 +27,5 @@
*
* @api
*/
- function setContainer(ContainerInterface $container = null);
+ public function setContainer(ContainerInterface $container = null);
}
View
2  ContainerBuilder.php
@@ -854,7 +854,7 @@ public function findTaggedServiceIds($name)
*
* @return array An array of Service conditionals
*/
- static public function getServiceConditionals($value)
+ public static function getServiceConditionals($value)
{
$services = array();
View
22 ContainerInterface.php
@@ -38,7 +38,7 @@
*
* @api
*/
- function set($id, $service, $scope = self::SCOPE_CONTAINER);
+ public function set($id, $service, $scope = self::SCOPE_CONTAINER);
/**
* Gets a service.
@@ -54,7 +54,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.
@@ -65,7 +65,7 @@ function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
*
* @api
*/
- function has($id);
+ public function has($id);
/**
* Gets a parameter.
@@ -78,7 +78,7 @@ function has($id);
*
* @api
*/
- function getParameter($name);
+ public function getParameter($name);
/**
* Checks if a parameter exists.
@@ -89,7 +89,7 @@ function getParameter($name);
*
* @api
*/
- function hasParameter($name);
+ public function hasParameter($name);
/**
* Sets a parameter.
@@ -99,7 +99,7 @@ function hasParameter($name);
*
* @api
*/
- function setParameter($name, $value);
+ public function setParameter($name, $value);
/**
* Enters the given scope
@@ -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
@@ -117,7 +117,7 @@ function enterScope($name);
*
* @api
*/
- function leaveScope($name);
+ public function leaveScope($name);
/**
* Adds a scope to the container
@@ -126,7 +126,7 @@ function leaveScope($name);
*
* @api
*/
- function addScope(ScopeInterface $scope);
+ public function addScope(ScopeInterface $scope);
/**
* Whether this container has the given scope
@@ -137,7 +137,7 @@ function addScope(ScopeInterface $scope);
*
* @api
*/
- function hasScope($name);
+ public function hasScope($name);
/**
* Determines whether the given scope is currently active.
@@ -150,5 +150,5 @@ function hasScope($name);
*
* @api
*/
- function isScopeActive($name);
+ public function isScopeActive($name);
}
View
2  Dumper/DumperInterface.php
@@ -29,5 +29,5 @@
*
* @api
*/
- function dump(array $options = array());
+ public function dump(array $options = array());
}
View
2  Dumper/XmlDumper.php
@@ -281,7 +281,7 @@ private function escape($arguments)
*
* @param mixed $value Value to convert
*/
- static public function phpToXml($value)
+ public static function phpToXml($value)
{
switch (true) {
case null === $value:
View
2  Extension/ConfigurationExtensionInterface.php
@@ -28,5 +28,5 @@
*
* @return ConfigurationInterface|null The configuration or null
*/
- function getConfiguration(array $config, ContainerBuilder $container);
+ public function getConfiguration(array $config, ContainerBuilder $container);
}
View
8 Extension/ExtensionInterface.php
@@ -32,7 +32,7 @@
*
* @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).
@@ -41,7 +41,7 @@ function load(array $config, ContainerBuilder $container);
*
* @api
*/
- function getNamespace();
+ public function getNamespace();
/**
* Returns the base path for the XSD files.
@@ -50,7 +50,7 @@ function getNamespace();
*
* @api
*/
- function getXsdValidationBasePath();
+ public function getXsdValidationBasePath();
/**
* Returns the recommended alias to use in XML.
@@ -61,5 +61,5 @@ function getXsdValidationBasePath();
*
* @api
*/
- function getAlias();
+ public function getAlias();
}
View
2  IntrospectableContainerInterface.php
@@ -28,6 +28,6 @@
* @return Boolean true if the service has been initialized, false otherwise
*
*/
- function initialized($id);
+ public function initialized($id);
}
View
2  Loader/XmlFileLoader.php
@@ -448,7 +448,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();
View
20 ParameterBag/ParameterBagInterface.php
@@ -27,7 +27,7 @@
*
* @api
*/
- function clear();
+ public function clear();
/**
* Adds parameters to the service container parameters.
@@ -36,7 +36,7 @@ function clear();
*
* @api
*/
- function add(array $parameters);
+ public function add(array $parameters);
/**
* Gets the service container parameters.
@@ -45,7 +45,7 @@ function add(array $parameters);
*
* @api
*/
- function all();
+ public function all();
/**
* Gets a service container parameter.
@@ -58,7 +58,7 @@ function all();
*
* @api
*/
- function get($name);
+ public function get($name);
/**
* Sets a service container parameter.
@@ -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.
@@ -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.
@@ -93,7 +93,7 @@ function resolve();
*
* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
*/
- function resolveValue($value);
+ public function resolveValue($value);
/**
* Escape parameter placeholders %
@@ -102,7 +102,7 @@ function resolveValue($value);
*
* @return mixed
*/
- function escapeValue($value);
+ public function escapeValue($value);
/**
* Unescape parameter placeholders %
@@ -111,5 +111,5 @@ function escapeValue($value);
*
* @return mixed
*/
- function unescapeValue($value);
+ public function unescapeValue($value);
}
View
4 ScopeInterface.php
@@ -23,10 +23,10 @@
/**
* @api
*/
- function getName();
+ public function getName();
/**
* @api
*/
- function getParentName();
+ public function getParentName();
}
View
2  SimpleXMLElement.php
@@ -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);
View
2  TaggedContainerInterface.php
@@ -29,5 +29,5 @@
*
* @api
*/
- function findTaggedServiceIds($name);
+ public function findTaggedServiceIds($name);
}
View
1  Tests/ContainerBuilderTest.php
@@ -550,5 +550,4 @@ public function testThrowsExceptionWhenSetDefinitionOnAFrozenContainer()
}
}
-
class FooClass {}
View
4 Tests/CrossCheckTest.php
@@ -16,7 +16,7 @@
class CrossCheckTest extends \PHPUnit_Framework_TestCase
{
- static protected $fixturesPath;
+ protected static $fixturesPath;
protected function setUp()
{
@@ -25,7 +25,7 @@ protected function setUp()
}
}
- static public function setUpBeforeClass()
+ public static function setUpBeforeClass()
{
self::$fixturesPath = __DIR__.'/Fixtures/';
View
4 Tests/Dumper/GraphvizDumperTest.php
@@ -16,7 +16,7 @@
class GraphvizDumperTest extends \PHPUnit_Framework_TestCase
{
- static protected $fixturesPath;
+ protected static $fixturesPath;
protected function setUp()
{
@@ -25,7 +25,7 @@ protected function setUp()
}
}
- static public function setUpBeforeClass()
+ public static function setUpBeforeClass()
{
self::$fixturesPath = __DIR__.'/../Fixtures/';
}
View
4 Tests/Dumper/PhpDumperTest.php
@@ -19,7 +19,7 @@
class PhpDumperTest extends \PHPUnit_Framework_TestCase
{
- static protected $fixturesPath;
+ protected static $fixturesPath;
protected function setUp()
{
@@ -28,7 +28,7 @@ protected function setUp()
}
}
- static public function setUpBeforeClass()
+ public static function setUpBeforeClass()
{
self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
}
View
4 Tests/Dumper/XmlDumperTest.php
@@ -16,7 +16,7 @@
class XmlDumperTest extends \PHPUnit_Framework_TestCase
{
- static protected $fixturesPath;
+ protected static $fixturesPath;
protected function setUp()
{
@@ -25,7 +25,7 @@ protected function setUp()
}
}
- static public function setUpBeforeClass()
+ public static function setUpBeforeClass()
{
self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
}
View
4 Tests/Dumper/YamlDumperTest.php
@@ -16,7 +16,7 @@
class YamlDumperTest extends \PHPUnit_Framework_TestCase
{
- static protected $fixturesPath;
+ protected static $fixturesPath;
protected function setUp()
{
@@ -25,7 +25,7 @@ protected function setUp()
}
}
- static public function setUpBeforeClass()
+ public static function setUpBeforeClass()
{
self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
}
View
6 Tests/Fixtures/includes/classes.php
@@ -16,17 +16,17 @@ public function configure($instance)
$instance->configure();
}
- static public function getInstance()
+ public static function getInstance()
{
return new self();
}
- static public function configureStatic($instance)
+ public static function configureStatic($instance)
{
$instance->configure();
}
- static public function configureStatic1()
+ public static function configureStatic1()
{
}
}
View
2  Tests/Fixtures/includes/foo.php
@@ -11,7 +11,7 @@ public function __construct($arguments = array())
$this->arguments = $arguments;
}
- static public function getInstance($arguments = array())
+ public static function getInstance($arguments = array())
{
$obj = new self($arguments);
$obj->called = true;
View
4 Tests/Loader/IniFileLoaderTest.php
@@ -17,12 +17,12 @@
class IniFileLoaderTest extends \PHPUnit_Framework_TestCase
{
- static protected $fixturesPath;
+ protected static $fixturesPath;
protected $container;
protected $loader;
- static public function setUpBeforeClass()
+ public static function setUpBeforeClass()
{
self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
}
View
4 Tests/Loader/XmlFileLoaderTest.php
@@ -25,7 +25,7 @@
class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
{
- static protected $fixturesPath;
+ protected static $fixturesPath;
protected function setUp()
{
@@ -34,7 +34,7 @@ protected function setUp()
}
}
- static public function setUpBeforeClass()
+ public static function setUpBeforeClass()
{
self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
require_once self::$fixturesPath.'/includes/foo.php';
View
4 Tests/Loader/YamlFileLoaderTest.php
@@ -23,7 +23,7 @@
class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
{
- static protected $fixturesPath;
+ protected static $fixturesPath;
protected function setUp()
{
@@ -36,7 +36,7 @@ protected function setUp()
}
}
- static public function setUpBeforeClass()
+ public static function setUpBeforeClass()
{
self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
require_once self::$fixturesPath.'/includes/foo.php';
Please sign in to comment.
Something went wrong with that request. Please try again.