diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php index 28b88b673d..c315d9c55d 100644 --- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php +++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php @@ -88,7 +88,7 @@ class DoctrineDataCollector extends DataCollector private function sanitizeQueries($queries) { foreach ($queries as $i => $query) { - foreach ((array)$query['params'] as $j => $param) { + foreach ((array) $query['params'] as $j => $param) { $queries[$i]['params'][$j] = $this->varToString($param); } } diff --git a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php index 39c3b11f21..eaabcfc991 100644 --- a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php +++ b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php @@ -26,7 +26,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; */ class MergeCollectionListener implements EventSubscriberInterface { - static public function getSubscribedEvents() + public static function getSubscribedEvents() { return array(FormEvents::BIND_NORM_DATA => 'onBindNormData'); } diff --git a/src/Symfony/Bridge/Doctrine/RegistryInterface.php b/src/Symfony/Bridge/Doctrine/RegistryInterface.php index 6ecb2d7ed1..d7d565de4b 100644 --- a/src/Symfony/Bridge/Doctrine/RegistryInterface.php +++ b/src/Symfony/Bridge/Doctrine/RegistryInterface.php @@ -26,7 +26,7 @@ interface RegistryInterface * * @return string The default connection name */ - function getDefaultConnectionName(); + public function getDefaultConnectionName(); /** * Gets the named connection. @@ -35,28 +35,28 @@ interface RegistryInterface * * @return Connection */ - function getConnection($name = null); + public function getConnection($name = null); /** * Gets an array of all registered connections * * @return array An array of Connection instances */ - function getConnections(); + public function getConnections(); /** * Gets all connection names. * * @return array An array of connection names */ - function getConnectionNames(); + public function getConnectionNames(); /** * Gets the default entity manager name. * * @return string The default entity manager name */ - function getDefaultEntityManagerName(); + public function getDefaultEntityManagerName(); /** * Gets a named entity manager. @@ -65,14 +65,14 @@ interface RegistryInterface * * @return EntityManager */ - function getEntityManager($name = null); + public function getEntityManager($name = null); /** * Gets an array of all registered entity managers * * @return array An array of EntityManager instances */ - function getEntityManagers(); + public function getEntityManagers(); /** * Resets a named entity manager. @@ -91,7 +91,7 @@ interface RegistryInterface * * @return EntityManager */ - function resetEntityManager($name = null); + public function resetEntityManager($name = null); /** * Resolves a registered namespace alias to the full namespace. @@ -104,14 +104,14 @@ interface RegistryInterface * * @see Configuration::getEntityNamespace */ - function getEntityNamespace($alias); + public function getEntityNamespace($alias); /** * Gets all connection names. * * @return array An array of connection names */ - function getEntityManagerNames(); + public function getEntityManagerNames(); /** * Gets the EntityRepository for an entity. @@ -121,7 +121,7 @@ interface RegistryInterface * * @return Doctrine\ORM\EntityRepository */ - function getRepository($entityName, $entityManagerName = null); + public function getRepository($entityName, $entityManagerName = null); /** * Gets the entity manager associated with a given class. @@ -130,5 +130,5 @@ interface RegistryInterface * * @return EntityManager|null */ - function getEntityManagerForClass($class); + public function getEntityManagerForClass($class); } diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/ConvertMappingDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/ConvertMappingDoctrineCommand.php index 729cb1dc5a..033fcade96 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/ConvertMappingDoctrineCommand.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/ConvertMappingDoctrineCommand.php @@ -50,7 +50,6 @@ EOT return parent::execute($input, $output); } - protected function getExporter($toType, $destPath) { $exporter = parent::getExporter($toType, $destPath); diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/DoctrineCommandHelper.php b/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/DoctrineCommandHelper.php index 647212621a..4b4fad81fa 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/DoctrineCommandHelper.php +++ b/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/DoctrineCommandHelper.php @@ -29,7 +29,7 @@ abstract class DoctrineCommandHelper * @param Application $application * @param string $emName */ - static public function setApplicationEntityManager(Application $application, $emName) + public static function setApplicationEntityManager(Application $application, $emName) { $em = $application->getKernel()->getContainer()->get('doctrine')->getEntityManager($emName); $helperSet = $application->getHelperSet(); @@ -37,7 +37,7 @@ abstract class DoctrineCommandHelper $helperSet->set(new EntityManagerHelper($em), 'em'); } - static public function setApplicationConnection(Application $application, $connName) + public static function setApplicationConnection(Application $application, $connName) { $connection = $application->getKernel()->getContainer()->get('doctrine')->getConnection($connName); $helperSet = $application->getHelperSet(); diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/XMLSchemaTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/XMLSchemaTest.php index 8ce762dcf7..3bcb696e68 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/XMLSchemaTest.php +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/XMLSchemaTest.php @@ -13,7 +13,7 @@ namespace Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection; class XMLSchemaTest extends \PHPUnit_Framework_TestCase { - static public function dataValidateSchemaFiles() + public static function dataValidateSchemaFiles() { $schemaFiles = array(); $di = new \DirectoryIterator(__DIR__."/Fixtures/config/xml"); @@ -35,7 +35,6 @@ class XMLSchemaTest extends \PHPUnit_Framework_TestCase $dom = new \DOMDocument('1.0', 'UTF-8'); $dom->load($file); - $dbalElements = $dom->getElementsByTagNameNS("http://symfony.com/schema/dic/doctrine", "config"); if ($dbalElements->length) { $dbalDom = new \DOMDocument('1.0', 'UTF-8'); diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinderInterface.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinderInterface.php index a2ef3aa1d9..433ed8f548 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinderInterface.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinderInterface.php @@ -11,7 +11,6 @@ namespace Symfony\Bundle\FrameworkBundle\CacheWarmer; - /** * Interface for finding all the templates. * @@ -24,5 +23,5 @@ interface TemplateFinderInterface * * @return array An array of templates of type TemplateReferenceInterface */ - function findAllTemplates(); + public function findAllTemplates(); } diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php index d13e76947d..b0dc5f8b37 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php @@ -24,7 +24,7 @@ class CompilerDebugDumpPass implements CompilerPassInterface $cache->write(implode("\n", $container->getCompiler()->getLog())); } - static public function getCompilerLogFilename(ContainerInterface $container) + public static function getCompilerLogFilename(ContainerInterface $container) { $class = $container->getParameter('kernel.container_class'); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_errors.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_errors.html.php index ac4315f957..97c80b7765 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_errors.html.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_errors.html.php @@ -4,4 +4,4 @@ renderBlock('field_errors'); ?> - +renderBlock('field_rows') ?> rest($form) ?> - diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php index dd433eac45..491ece3602 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php @@ -3,4 +3,3 @@ widget($form) ?> - diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php b/src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php index 0b125705ee..edc087e867 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php @@ -30,5 +30,5 @@ interface EngineInterface extends BaseEngineInterface * * @return Response A Response instance */ - function renderResponse($view, array $parameters = array(), Response $response = null); + public function renderResponse($view, array $parameters = array(), Response $response = null); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php index 257ff510bc..df8b0501a7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php @@ -222,7 +222,7 @@ class CodeHelper extends Helper return 'code'; } - static protected function fixCodeMarkup($line) + protected static function fixCodeMarkup($line) { // ending tag from previous line $opening = strpos($line, 'boot(); @@ -52,7 +52,7 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase * * @return string The directory where phpunit.xml(.dist) is stored */ - static protected function getPhpUnitXmlDir() + protected static function getPhpUnitXmlDir() { if (!isset($_SERVER['argv']) || false === strpos($_SERVER['argv'][0], 'phpunit')) { throw new \RuntimeException('You must override the WebTestCase::createKernel() method.'); @@ -85,7 +85,7 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase * * @return string The value of the phpunit cli configuration option */ - static private function getPhpUnitCliConfigArgument() + private static function getPhpUnitCliConfigArgument() { $dir = null; $reversedArgs = array_reverse($_SERVER['argv']); @@ -110,7 +110,7 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase * * @return string The Kernel class name */ - static protected function getKernelClass() + protected static function getKernelClass() { $dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : static::getPhpUnitXmlDir(); @@ -141,7 +141,7 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase * * @return HttpKernelInterface A HttpKernelInterface instance */ - static protected function createKernel(array $options = array()) + protected static function createKernel(array $options = array()) { if (null === static::$class) { static::$class = static::getKernelClass(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php index dc15a17da2..83ffd48d1b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php @@ -16,7 +16,6 @@ use Symfony\Bundle\FrameworkBundle\Templating\TemplateNameParser; use Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder; use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BaseBundle\BaseBundle; - class TemplateFinderTest extends TestCase { public function testFindAllTemplates() diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/ContainerAwareEventDispatcherTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/ContainerAwareEventDispatcherTest.php index c200553aac..551dec253b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/ContainerAwareEventDispatcherTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/ContainerAwareEventDispatcherTest.php @@ -203,7 +203,7 @@ class ContainerAwareEventDispatcherTest extends \PHPUnit_Framework_TestCase class Service { - function onEvent(Event $e) + public function onEvent(Event $e) { } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php index fdb88c0ec0..d8d5df67cc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php @@ -58,7 +58,6 @@ class RedirectControllerTest extends TestCase $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); - $container ->expects($this->at(0)) ->method('get') diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Debug/TraceableEventDispatcherTest.php index 1ee4b0c8fa..c481691234 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Debug/TraceableEventDispatcherTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Debug/TraceableEventDispatcherTest.php @@ -42,9 +42,9 @@ class TraceableEventDispatcherTest extends TestCase class StaticClassFixture { - static public $called = false; + public static $called = false; - static public function staticListener($event) + public static function staticListener($event) { self::$called = true; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml index 7462fbfcbd..69a8e6d45a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml @@ -17,4 +17,3 @@ session_setflash: session_showflash: pattern: /session_showflash defaults: { _controller: TestBundle:Session:showFlash} - diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php index aeff627c58..579fe1f2cf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\Kernel; class WebTestCase extends BaseWebTestCase { - static public function assertRedirect($response, $location) + public static function assertRedirect($response, $location) { self::assertTrue($response->isRedirect(), 'Response is not a redirect, got status code: '.$response->getStatusCode()); self::assertEquals('http://localhost'.$location, $response->headers->get('Location')); @@ -42,14 +42,14 @@ class WebTestCase extends BaseWebTestCase $fs->remove($dir); } - static protected function getKernelClass() + protected static function getKernelClass() { require_once __DIR__.'/app/AppKernel.php'; return 'Symfony\Bundle\FrameworkBundle\Tests\Functional\AppKernel'; } - static protected function createKernel(array $options = array()) + protected static function createKernel(array $options = array()) { $class = self::getKernelClass(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml index 7b67b7d1cb..65dd6c7fa9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml @@ -1,3 +1,2 @@ imports: - { resource: ./../config/default.yml } - diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php index 57590d4f00..d30a57ec35 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php @@ -48,7 +48,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase $resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface'); $kernel = new HttpKernel($dispatcher, $container, $resolver); - $controller = function() use($expected) { + $controller = function() use ($expected) { return $expected; }; diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/CodeHelperTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/CodeHelperTest.php index 357170d3d8..0d53544df3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/CodeHelperTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/CodeHelperTest.php @@ -17,7 +17,7 @@ class CodeHelperTest extends \PHPUnit_Framework_TestCase { protected static $helper; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$helper = new CodeHelper('txmt://open?url=file://%f&line=%l', '/root', 'UTF-8'); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php index 01b0bc614e..06432b247b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @@ -85,14 +85,14 @@ class FormHelperDivLayoutTest extends AbstractDivLayoutTest $this->helper->setTheme($view, $themes); } - static public function themeBlockInheritanceProvider() + public static function themeBlockInheritanceProvider() { return array( array(array('TestBundle:Parent')) ); } - static public function themeInheritanceProvider() + public static function themeInheritanceProvider() { return array( array(array('TestBundle:Parent'), array('TestBundle:Child')) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php index 1a412c53ff..91662b7c81 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php @@ -268,7 +268,7 @@ class MainConfiguration implements ConfigurationInterface ->ifTrue(function($v) { return true === $v['security'] && isset($v['pattern']) && !isset($v['request_matcher']); }) - ->then(function($firewall) use($abstractFactoryKeys) { + ->then(function($firewall) use ($abstractFactoryKeys) { foreach ($abstractFactoryKeys as $k) { if (!isset($firewall[$k]['check_path'])) { continue; diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php index 611b0285c0..c74fb1348a 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php @@ -80,7 +80,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface } } - public final function addOption($name, $default = null) + final public function addOption($name, $default = null) { $this->options[$name] = $default; } diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php index 5ef4c00fff..5e8773b742 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php @@ -21,11 +21,11 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; */ interface SecurityFactoryInterface { - function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint); + public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint); - function getPosition(); + public function getPosition(); - function getKey(); + public function getKey(); - function addConfiguration(NodeDefinition $builder); + public function addConfiguration(NodeDefinition $builder); } diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index 4c5597a6f5..c32e383239 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -600,7 +600,6 @@ class SecurityExtension extends Extension return $this->factories = $factories; } - /** * Returns the base path for the XSD files. * @@ -616,4 +615,3 @@ class SecurityExtension extends Extension return 'http://symfony.com/schema/dic/security'; } } - diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php index b6e8acb53d..85e25706fc 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\Kernel; class WebTestCase extends BaseWebTestCase { - static public function assertRedirect($response, $location) + public static function assertRedirect($response, $location) { self::assertTrue($response->isRedirect(), 'Response is not a redirect, got status code: '.$response->getStatusCode()); self::assertEquals('http://localhost'.$location, $response->headers->get('Location')); @@ -42,14 +42,14 @@ class WebTestCase extends BaseWebTestCase $fs->remove($dir); } - static protected function getKernelClass() + protected static function getKernelClass() { require_once __DIR__.'/app/AppKernel.php'; return 'Symfony\Bundle\SecurityBundle\Tests\Functional\AppKernel'; } - static protected function createKernel(array $options = array()) + protected static function createKernel(array $options = array()) { $class = self::getKernelClass(); diff --git a/src/Symfony/Bundle/SwiftmailerBundle/Logger/MessageLogger.php b/src/Symfony/Bundle/SwiftmailerBundle/Logger/MessageLogger.php index 1950d3b33e..f9163ff0c2 100644 --- a/src/Symfony/Bundle/SwiftmailerBundle/Logger/MessageLogger.php +++ b/src/Symfony/Bundle/SwiftmailerBundle/Logger/MessageLogger.php @@ -11,7 +11,6 @@ namespace Symfony\Bundle\SwiftmailerBundle\Logger; - /** * MessageLogger. * diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php index da4024a98f..da963fce37 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php @@ -28,7 +28,7 @@ class WebProfilerExtensionTest extends TestCase */ private $container; - static public function assertSaneContainer(Container $container, $message = '') + public static function assertSaneContainer(Container $container, $message = '') { $errors = array(); foreach ($container->getServiceIds() as $id) { diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php index 16063ee8ed..148767d17b 100644 --- a/src/Symfony/Component/BrowserKit/Cookie.php +++ b/src/Symfony/Component/BrowserKit/Cookie.php @@ -117,7 +117,7 @@ class Cookie * * @api */ - static public function fromString($cookie, $url = null) + public static function fromString($cookie, $url = null) { $parts = explode(';', $cookie); diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php index 87b09f3dfb..c632849e53 100644 --- a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php +++ b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php @@ -18,7 +18,7 @@ namespace Symfony\Component\ClassLoader; */ class ClassCollectionLoader { - static private $loaded; + private static $loaded; /** * Loads a list of classes and caches them in one big file. @@ -32,7 +32,7 @@ class ClassCollectionLoader * * @throws \InvalidArgumentException When class can't be loaded */ - static public function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php') + public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php') { // each $name can only be loaded once per PHP process if (isset(self::$loaded[$name])) { @@ -123,7 +123,7 @@ class ClassCollectionLoader * * @return string Namespaces with brackets */ - static public function fixNamespaceDeclarations($source) + public static function fixNamespaceDeclarations($source) { if (!function_exists('token_get_all')) { return $source; @@ -177,7 +177,7 @@ class ClassCollectionLoader * * @throws \RuntimeException when a cache file cannot be written */ - static private function writeCacheFile($file, $content) + private static function writeCacheFile($file, $content) { $tmpFile = tempnam(dirname($file), basename($file)); if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) { @@ -199,7 +199,7 @@ class ClassCollectionLoader * * @return string The PHP string with the comments removed */ - static private function stripComments($source) + private static function stripComments($source) { if (!function_exists('token_get_all')) { return $source; diff --git a/src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php b/src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php index 8a958e01f9..20ac6467bc 100644 --- a/src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php +++ b/src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php @@ -21,7 +21,7 @@ class DebugUniversalClassLoader extends UniversalClassLoader /** * Replaces all regular UniversalClassLoader instances by a DebugUniversalClassLoader ones. */ - static public function enable() + public static function enable() { if (!is_array($functions = spl_autoload_functions())) { return; diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php index 1088fd7c32..cb3b424ace 100644 --- a/src/Symfony/Component/Config/Definition/ArrayNode.php +++ b/src/Symfony/Component/Config/Definition/ArrayNode.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Config\Definition; - use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException; use Symfony\Component\Config\Definition\Exception\InvalidTypeException; use Symfony\Component\Config\Definition\Exception\UnsetKeyException; diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php index bb8a61c9c7..b40d65ddea 100644 --- a/src/Symfony/Component/Config/Definition/BaseNode.php +++ b/src/Symfony/Component/Config/Definition/BaseNode.php @@ -150,7 +150,7 @@ abstract class BaseNode implements NodeInterface * * @throws ForbiddenOverwriteException */ - public final function merge($leftSide, $rightSide) + final public function merge($leftSide, $rightSide) { if (!$this->allowOverwrite) { throw new ForbiddenOverwriteException(sprintf( @@ -174,7 +174,7 @@ abstract class BaseNode implements NodeInterface * * @return mixed The normalized value. */ - public final function normalize($value) + final public function normalize($value) { // run custom normalization closures foreach ($this->normalizationClosures as $closure) { @@ -202,7 +202,7 @@ abstract class BaseNode implements NodeInterface * * @return mixed The finalized value */ - public final function finalize($value) + final public function finalize($value) { $this->validateType($value); diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php index 71cd39cf12..ffc4e57153 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php @@ -214,11 +214,11 @@ class ExprBuilder * * @return array */ - static public function buildExpressions(array $expressions) + public static function buildExpressions(array $expressions) { foreach ($expressions as $k => $expr) { if ($expr instanceof ExprBuilder) { - $expressions[$k] = function($v) use($expr) { + $expressions[$k] = function($v) use ($expr) { return call_user_func($expr->ifPart, $v) ? call_user_func($expr->thenPart, $v) : $v; }; } diff --git a/src/Symfony/Component/Config/Definition/Builder/ParentNodeDefinitionInterface.php b/src/Symfony/Component/Config/Definition/Builder/ParentNodeDefinitionInterface.php index 2d95954239..005c26b7df 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ParentNodeDefinitionInterface.php +++ b/src/Symfony/Component/Config/Definition/Builder/ParentNodeDefinitionInterface.php @@ -18,9 +18,9 @@ namespace Symfony\Component\Config\Definition\Builder; */ interface ParentNodeDefinitionInterface { - function children(); + public function children(); - function append(NodeDefinition $node); + public function append(NodeDefinition $node); - function setBuilder(NodeBuilder $builder); + public function setBuilder(NodeBuilder $builder); } diff --git a/src/Symfony/Component/Config/Definition/ConfigurationInterface.php b/src/Symfony/Component/Config/Definition/ConfigurationInterface.php index dc189e2e21..336cb0088e 100644 --- a/src/Symfony/Component/Config/Definition/ConfigurationInterface.php +++ b/src/Symfony/Component/Config/Definition/ConfigurationInterface.php @@ -23,5 +23,5 @@ interface ConfigurationInterface * * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder */ - function getConfigTreeBuilder(); + public function getConfigTreeBuilder(); } diff --git a/src/Symfony/Component/Config/Definition/NodeInterface.php b/src/Symfony/Component/Config/Definition/NodeInterface.php index 89c4360253..cdbc0ef096 100644 --- a/src/Symfony/Component/Config/Definition/NodeInterface.php +++ b/src/Symfony/Component/Config/Definition/NodeInterface.php @@ -26,28 +26,28 @@ interface NodeInterface * * @return string The name of the node */ - function getName(); + public function getName(); /** * Returns the path of the node. * * @return string The node path */ - function getPath(); + public function getPath(); /** * Returns true when the node is required. * * @return Boolean If the node is required */ - function isRequired(); + public function isRequired(); /** * Returns true when the node has a default value. * * @return Boolean If the node has a default value */ - function hasDefaultValue(); + public function hasDefaultValue(); /** * Returns the default value of the node. @@ -55,7 +55,7 @@ interface NodeInterface * @return mixed The default value * @throws \RuntimeException if the node has no default value */ - function getDefaultValue(); + public function getDefaultValue(); /** * Normalizes the supplied value. @@ -64,7 +64,7 @@ interface NodeInterface * * @return mixed The normalized value */ - function normalize($value); + public function normalize($value); /** * Merges two values together. @@ -74,7 +74,7 @@ interface NodeInterface * * @return mixed The merged values */ - function merge($leftSide, $rightSide); + public function merge($leftSide, $rightSide); /** * Finalizes a value. @@ -83,5 +83,5 @@ interface NodeInterface * * @return mixed The finalized value */ - function finalize($value); + public function finalize($value); } diff --git a/src/Symfony/Component/Config/Definition/Processor.php b/src/Symfony/Component/Config/Definition/Processor.php index a6c3181118..a40d2c70c1 100644 --- a/src/Symfony/Component/Config/Definition/Processor.php +++ b/src/Symfony/Component/Config/Definition/Processor.php @@ -65,7 +65,7 @@ class Processor * * @return array the config with normalized keys */ - static public function normalizeKeys(array $config) + public static function normalizeKeys(array $config) { foreach ($config as $key => $value) { if (is_array($value)) { @@ -104,7 +104,7 @@ class Processor * * @return array */ - static public function normalizeConfig($config, $key, $plural = null) + public static function normalizeConfig($config, $key, $plural = null) { if (null === $plural) { $plural = $key.'s'; diff --git a/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php b/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php index 8f08c989af..8bbb84d4dc 100644 --- a/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php +++ b/src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php @@ -23,5 +23,5 @@ interface PrototypeNodeInterface extends NodeInterface * * @param string $name The name of the node */ - function setName($name); + public function setName($name); } diff --git a/src/Symfony/Component/Config/FileLocatorInterface.php b/src/Symfony/Component/Config/FileLocatorInterface.php index d756b831d6..4ff19b4de9 100644 --- a/src/Symfony/Component/Config/FileLocatorInterface.php +++ b/src/Symfony/Component/Config/FileLocatorInterface.php @@ -27,5 +27,5 @@ interface FileLocatorInterface * * @throws \InvalidArgumentException When file is not found */ - function locate($name, $currentPath = null, $first = true); + public function locate($name, $currentPath = null, $first = true); } diff --git a/src/Symfony/Component/Config/Loader/FileLoader.php b/src/Symfony/Component/Config/Loader/FileLoader.php index 39c36b465f..c4e3cedf28 100644 --- a/src/Symfony/Component/Config/Loader/FileLoader.php +++ b/src/Symfony/Component/Config/Loader/FileLoader.php @@ -22,7 +22,7 @@ use Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceExceptio */ abstract class FileLoader extends Loader { - static protected $loading = array(); + protected static $loading = array(); protected $locator; diff --git a/src/Symfony/Component/Config/Loader/LoaderInterface.php b/src/Symfony/Component/Config/Loader/LoaderInterface.php index ca237d20a7..a252731eb5 100644 --- a/src/Symfony/Component/Config/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Config/Loader/LoaderInterface.php @@ -24,7 +24,7 @@ interface LoaderInterface * @param mixed $resource The resource * @param string $type The resource type */ - function load($resource, $type = null); + public function load($resource, $type = null); /** * Returns true if this class supports the given resource. @@ -34,20 +34,20 @@ interface LoaderInterface * * @return Boolean true if this class supports the given resource, false otherwise */ - function supports($resource, $type = null); + public function supports($resource, $type = null); /** * Gets the loader resolver. * * @return LoaderResolver A LoaderResolver instance */ - function getResolver(); + public function getResolver(); /** * Sets the loader resolver. * * @param LoaderResolver $resolver A LoaderResolver instance */ - function setResolver(LoaderResolver $resolver); + public function setResolver(LoaderResolver $resolver); } diff --git a/src/Symfony/Component/Config/Loader/LoaderResolverInterface.php b/src/Symfony/Component/Config/Loader/LoaderResolverInterface.php index f660401ef0..57d878152a 100644 --- a/src/Symfony/Component/Config/Loader/LoaderResolverInterface.php +++ b/src/Symfony/Component/Config/Loader/LoaderResolverInterface.php @@ -26,5 +26,5 @@ interface LoaderResolverInterface * * @return LoaderInterface A LoaderInterface instance */ - function resolve($resource, $type = null); + public function resolve($resource, $type = null); } diff --git a/src/Symfony/Component/Config/Resource/ResourceInterface.php b/src/Symfony/Component/Config/Resource/ResourceInterface.php index 024f2e95f9..d624a573b0 100644 --- a/src/Symfony/Component/Config/Resource/ResourceInterface.php +++ b/src/Symfony/Component/Config/Resource/ResourceInterface.php @@ -23,7 +23,7 @@ interface ResourceInterface * * @return string A string representation of the Resource */ - function __toString(); + public function __toString(); /** * Returns true if the resource has not been updated since the given timestamp. @@ -32,12 +32,12 @@ interface ResourceInterface * * @return Boolean true if the resource has not been updated, false otherwise */ - function isFresh($timestamp); + public function isFresh($timestamp); /** * Returns the resource tied to this Resource. * * @return mixed The resource */ - function getResource(); + public function getResource(); } diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index 400f7bef8a..24cd5c21fb 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -596,7 +596,7 @@ class Application * * @return array An array of abbreviations */ - static public function getAbbreviations($names) + public static function getAbbreviations($names) { $abbrevs = array(); foreach ($names as $name) { diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php index ca9f9d0e3f..0836084236 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php @@ -27,7 +27,7 @@ interface OutputFormatterInterface * * @api */ - function setDecorated($decorated); + public function setDecorated($decorated); /** * Gets the decorated flag. @@ -36,7 +36,7 @@ interface OutputFormatterInterface * * @api */ - function isDecorated(); + public function isDecorated(); /** * Sets a new style. @@ -46,7 +46,7 @@ interface OutputFormatterInterface * * @api */ - function setStyle($name, OutputFormatterStyleInterface $style); + public function setStyle($name, OutputFormatterStyleInterface $style); /** * Checks if output formatter has style with specified name. @@ -57,7 +57,7 @@ interface OutputFormatterInterface * * @api */ - function hasStyle($name); + public function hasStyle($name); /** * Gets style options from style with specified name. @@ -68,7 +68,7 @@ interface OutputFormatterInterface * * @api */ - function getStyle($name); + public function getStyle($name); /** * Formats a message according to the given styles. @@ -79,5 +79,5 @@ interface OutputFormatterInterface * * @api */ - function format($message); + public function format($message); } diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php index ad02b94289..3c6b8ad1f5 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Console\Formatter; */ class OutputFormatterStyle implements OutputFormatterStyleInterface { - static private $availableForegroundColors = array( + private static $availableForegroundColors = array( 'black' => 30, 'red' => 31, 'green' => 32, @@ -30,7 +30,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface 'cyan' => 36, 'white' => 37 ); - static private $availableBackgroundColors = array( + private static $availableBackgroundColors = array( 'black' => 40, 'red' => 41, 'green' => 42, @@ -40,7 +40,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface 'cyan' => 46, 'white' => 47 ); - static private $availableOptions = array( + private static $availableOptions = array( 'bold' => 1, 'underscore' => 4, 'blink' => 5, diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php index 3d84d96ac6..b5a55fef62 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php @@ -27,7 +27,7 @@ interface OutputFormatterStyleInterface * * @api */ - function setForeground($color = null); + public function setForeground($color = null); /** * Sets style background color. @@ -36,7 +36,7 @@ interface OutputFormatterStyleInterface * * @api */ - function setBackground($color = null); + public function setBackground($color = null); /** * Sets some specific style option. @@ -45,21 +45,21 @@ interface OutputFormatterStyleInterface * * @api */ - function setOption($option); + public function setOption($option); /** * Unsets some specific style option. * * @param string $option Theoption name */ - function unsetOption($option); + public function unsetOption($option); /** * Sets multiple style options at once. * * @param array $options */ - function setOptions(array $options); + public function setOptions(array $options); /** * Applies the style to a given text. @@ -68,5 +68,5 @@ interface OutputFormatterStyleInterface * * @return string */ - function apply($text); + public function apply($text); } diff --git a/src/Symfony/Component/Console/Helper/HelperInterface.php b/src/Symfony/Component/Console/Helper/HelperInterface.php index 25ee51393f..6d394496f6 100644 --- a/src/Symfony/Component/Console/Helper/HelperInterface.php +++ b/src/Symfony/Component/Console/Helper/HelperInterface.php @@ -27,7 +27,7 @@ interface HelperInterface * * @api */ - function setHelperSet(HelperSet $helperSet = null); + public function setHelperSet(HelperSet $helperSet = null); /** * Gets the helper set associated with this helper. @@ -36,7 +36,7 @@ interface HelperInterface * * @api */ - function getHelperSet(); + public function getHelperSet(); /** * Returns the canonical name of this helper. @@ -45,5 +45,5 @@ interface HelperInterface * * @api */ - function getName(); + public function getName(); } diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php index 17100868d7..b6a70e79df 100644 --- a/src/Symfony/Component/Console/Input/InputInterface.php +++ b/src/Symfony/Component/Console/Input/InputInterface.php @@ -23,7 +23,7 @@ interface InputInterface * * @return string The value of the first argument or null otherwise */ - function getFirstArgument(); + public function getFirstArgument(); /** * Returns true if the raw parameters (not parsed) contain a value. @@ -35,7 +35,7 @@ interface InputInterface * * @return Boolean true if the value is contained in the raw parameters */ - function hasParameterOption($values); + public function hasParameterOption($values); /** * Returns the value of a raw option (not parsed). @@ -48,14 +48,14 @@ interface InputInterface * * @return mixed The option value */ - function getParameterOption($values, $default = false); + public function getParameterOption($values, $default = false); /** * Binds the current Input instance with the given arguments and options. * * @param InputDefinition $definition A InputDefinition instance */ - function bind(InputDefinition $definition); + public function bind(InputDefinition $definition); /** * Validates if arguments given are correct. @@ -64,14 +64,14 @@ interface InputInterface * * @throws \RuntimeException */ - function validate(); + public function validate(); /** * Returns all the given arguments merged with the default values. * * @return array */ - function getArguments(); + public function getArguments(); /** * Gets argument by name. @@ -80,14 +80,14 @@ interface InputInterface * * @return mixed */ - function getArgument($name); + public function getArgument($name); /** * Returns all the given options merged with the default values. * * @return array */ - function getOptions(); + public function getOptions(); /** * Gets an option by name. @@ -96,12 +96,12 @@ interface InputInterface * * @return mixed */ - function getOption($name); + public function getOption($name); /** * Is this input means interactive? * * @return Boolean */ - function isInteractive(); + public function isInteractive(); } diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php index 8423d48c92..88ffba8878 100644 --- a/src/Symfony/Component/Console/Output/OutputInterface.php +++ b/src/Symfony/Component/Console/Output/OutputInterface.php @@ -41,7 +41,7 @@ interface OutputInterface * * @api */ - function write($messages, $newline = false, $type = 0); + public function write($messages, $newline = false, $type = 0); /** * Writes a message to the output and adds a newline at the end. @@ -51,7 +51,7 @@ interface OutputInterface * * @api */ - function writeln($messages, $type = 0); + public function writeln($messages, $type = 0); /** * Sets the verbosity of the output. @@ -60,7 +60,7 @@ interface OutputInterface * * @api */ - function setVerbosity($level); + public function setVerbosity($level); /** * Gets the current verbosity of the output. @@ -69,7 +69,7 @@ interface OutputInterface * * @api */ - function getVerbosity(); + public function getVerbosity(); /** * Sets the decorated flag. @@ -78,7 +78,7 @@ interface OutputInterface * * @api */ - function setDecorated($decorated); + public function setDecorated($decorated); /** * Gets the decorated flag. @@ -87,7 +87,7 @@ interface OutputInterface * * @api */ - function isDecorated(); + public function isDecorated(); /** * Sets output formatter. @@ -96,7 +96,7 @@ interface OutputInterface * * @api */ - function setFormatter(OutputFormatterInterface $formatter); + public function setFormatter(OutputFormatterInterface $formatter); /** * Returns current output formatter instance. @@ -105,5 +105,5 @@ interface OutputInterface * * @api */ - function getFormatter(); + public function getFormatter(); } diff --git a/src/Symfony/Component/CssSelector/CssSelector.php b/src/Symfony/Component/CssSelector/CssSelector.php index f5566be1f4..f624fff7ee 100644 --- a/src/Symfony/Component/CssSelector/CssSelector.php +++ b/src/Symfony/Component/CssSelector/CssSelector.php @@ -42,7 +42,7 @@ class CssSelector * * @api */ - static public function toXPath($cssExpr, $prefix = 'descendant-or-self::') + public static function toXPath($cssExpr, $prefix = 'descendant-or-self::') { if (is_string($cssExpr)) { if (!$cssExpr) { diff --git a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php index d37e4f1073..13e39270e0 100644 --- a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php +++ b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php @@ -23,7 +23,7 @@ use Symfony\Component\CssSelector\Exception\ParseException; */ class CombinedSelectorNode implements NodeInterface { - static protected $methodMapping = array( + protected static $methodMapping = array( ' ' => 'descendant', '>' => 'child', '+' => 'direct_adjacent', diff --git a/src/Symfony/Component/CssSelector/Node/FunctionNode.php b/src/Symfony/Component/CssSelector/Node/FunctionNode.php index 959f29df37..b392b27d07 100644 --- a/src/Symfony/Component/CssSelector/Node/FunctionNode.php +++ b/src/Symfony/Component/CssSelector/Node/FunctionNode.php @@ -24,7 +24,7 @@ use Symfony\Component\CssSelector\XPathExpr; */ class FunctionNode implements NodeInterface { - static protected $unsupported = array('target', 'lang', 'enabled', 'disabled'); + protected static $unsupported = array('target', 'lang', 'enabled', 'disabled'); protected $selector; protected $type; diff --git a/src/Symfony/Component/CssSelector/Node/NodeInterface.php b/src/Symfony/Component/CssSelector/Node/NodeInterface.php index 534f0dd7b1..113b1b75d7 100644 --- a/src/Symfony/Component/CssSelector/Node/NodeInterface.php +++ b/src/Symfony/Component/CssSelector/Node/NodeInterface.php @@ -26,12 +26,12 @@ interface NodeInterface * * @return string The string representation */ - function __toString(); + public function __toString(); /** * @return XPathExpr The XPath expression * * @throws ParseException When unknown operator is found */ - function toXpath(); + public function toXpath(); } diff --git a/src/Symfony/Component/CssSelector/Node/PseudoNode.php b/src/Symfony/Component/CssSelector/Node/PseudoNode.php index 3f93b70ab1..67f0beb595 100644 --- a/src/Symfony/Component/CssSelector/Node/PseudoNode.php +++ b/src/Symfony/Component/CssSelector/Node/PseudoNode.php @@ -23,7 +23,7 @@ use Symfony\Component\CssSelector\Exception\ParseException; */ class PseudoNode implements NodeInterface { - static protected $unsupported = array( + protected static $unsupported = array( 'indeterminate', 'first-line', 'first-letter', 'selection', 'before', 'after', 'link', 'visited', 'active', 'focus', 'hover', diff --git a/src/Symfony/Component/CssSelector/XPathExpr.php b/src/Symfony/Component/CssSelector/XPathExpr.php index 2e239ddd20..507b8ac16b 100644 --- a/src/Symfony/Component/CssSelector/XPathExpr.php +++ b/src/Symfony/Component/CssSelector/XPathExpr.php @@ -219,7 +219,7 @@ class XPathExpr * * @return string */ - static public function xpathLiteral($s) + public static function xpathLiteral($s) { if ($s instanceof Node\ElementNode) { // This is probably a symbol that looks like an expression... diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php index c41cf41776..a6c0eff136 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php @@ -31,5 +31,5 @@ interface CompilerPassInterface * * @api */ - function process(ContainerBuilder $container); + public function process(ContainerBuilder $container); } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/LoggingFormatter.php b/src/Symfony/Component/DependencyInjection/Compiler/LoggingFormatter.php index daee911692..89abc720fa 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/LoggingFormatter.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/LoggingFormatter.php @@ -11,7 +11,6 @@ namespace Symfony\Component\DependencyInjection\Compiler; - /** * Used to format logging messages during the compilation. * diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php b/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php index 81209c3893..d60ae35bc8 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php @@ -24,5 +24,5 @@ interface RepeatablePassInterface extends CompilerPassInterface * * @param RepeatedPass $repeatedPass */ - function setRepeatedPass(RepeatedPass $repeatedPass); + public function setRepeatedPass(RepeatedPass $repeatedPass); } diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php index cdac35be04..8a3a706597 100644 --- a/src/Symfony/Component/DependencyInjection/Container.php +++ b/src/Symfony/Component/DependencyInjection/Container.php @@ -440,7 +440,7 @@ class Container implements ContainerInterface * * @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); } @@ -452,7 +452,7 @@ class Container implements ContainerInterface * * @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, '_', '.'))); } diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php index 1879ec0617..eb96632c66 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php +++ b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php @@ -27,5 +27,5 @@ interface ContainerAwareInterface * * @api */ - function setContainer(ContainerInterface $container = null); + public function setContainer(ContainerInterface $container = null); } diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 4aff171899..9f003188d3 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -837,7 +837,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface * * @return array An array of Service conditionals */ - static public function getServiceConditionals($value) + public static function getServiceConditionals($value) { $services = array(); diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php index a5852c7528..0333c4f6f8 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php +++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php @@ -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. @@ -52,7 +52,7 @@ interface ContainerInterface * * @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. @@ -63,7 +63,7 @@ interface ContainerInterface * * @api */ - function has($id); + public function has($id); /** * Gets a parameter. @@ -76,7 +76,7 @@ interface ContainerInterface * * @api */ - function getParameter($name); + public function getParameter($name); /** * Checks if a parameter exists. @@ -87,7 +87,7 @@ interface ContainerInterface * * @api */ - function hasParameter($name); + public function hasParameter($name); /** * Sets a parameter. @@ -97,7 +97,7 @@ interface ContainerInterface * * @api */ - function setParameter($name, $value); + public function setParameter($name, $value); /** * Enters the given scope @@ -108,7 +108,7 @@ interface ContainerInterface * * @api */ - function enterScope($name); + public function enterScope($name); /** * Leaves the current scope, and re-enters the parent scope @@ -119,7 +119,7 @@ interface ContainerInterface * * @api */ - function leaveScope($name); + public function leaveScope($name); /** * Adds a scope to the container @@ -130,7 +130,7 @@ interface ContainerInterface * * @api */ - function addScope(ScopeInterface $scope); + public function addScope(ScopeInterface $scope); /** * Whether this container has the given scope @@ -141,7 +141,7 @@ interface ContainerInterface * * @api */ - function hasScope($name); + public function hasScope($name); /** * Determines whether the given scope is currently active. @@ -154,5 +154,5 @@ interface ContainerInterface * * @api */ - function isScopeActive($name); + public function isScopeActive($name); } diff --git a/src/Symfony/Component/DependencyInjection/Dumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/Dumper/DumperInterface.php index 6972cbf8fc..ba146f61c0 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/DumperInterface.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/DumperInterface.php @@ -29,5 +29,5 @@ interface DumperInterface * * @api */ - function dump(array $options = array()); + public function dump(array $options = array()); } diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php index 56977afc4b..dfaa881505 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php @@ -294,7 +294,7 @@ class XmlDumper extends Dumper * * @throws \RuntimeException When trying to dump object or resource */ - static public function phpToXml($value) + public static function phpToXml($value) { switch (true) { case null === $value: diff --git a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php index 7219281808..424f02088e 100644 --- a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php +++ b/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php @@ -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). @@ -41,7 +41,7 @@ interface ExtensionInterface * * @api */ - function getNamespace(); + public function getNamespace(); /** * Returns the base path for the XSD files. @@ -50,7 +50,7 @@ interface ExtensionInterface * * @api */ - function getXsdValidationBasePath(); + public function getXsdValidationBasePath(); /** * Returns the recommended alias to use in XML. @@ -61,5 +61,5 @@ interface ExtensionInterface * * @api */ - function getAlias(); + public function getAlias(); } diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index 76c91576f1..12b59e5cbe 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -467,7 +467,7 @@ EOF * * @return array A PHP array */ - static public function convertDomElementToArray(\DomElement $element) + public static function convertDomElementToArray(\DomElement $element) { $empty = true; $config = array(); diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php index da83cbe92c..f60a2c4ede 100644 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php @@ -27,7 +27,7 @@ interface ParameterBagInterface * * @api */ - function clear(); + public function clear(); /** * Adds parameters to the service container parameters. @@ -36,7 +36,7 @@ interface ParameterBagInterface * * @api */ - function add(array $parameters); + public function add(array $parameters); /** * Gets the service container parameters. @@ -45,7 +45,7 @@ interface ParameterBagInterface * * @api */ - function all(); + public function all(); /** * Gets a service container parameter. @@ -58,7 +58,7 @@ interface ParameterBagInterface * * @api */ - function get($name); + public function get($name); /** * Sets a service container parameter. @@ -68,7 +68,7 @@ interface ParameterBagInterface * * @api */ - function set($name, $value); + public function set($name, $value); /** * Returns true if a parameter name is defined. @@ -79,12 +79,12 @@ interface ParameterBagInterface * * @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,5 +93,5 @@ interface ParameterBagInterface * * @throws ParameterNotFoundException if a placeholder references a parameter that does not exist */ - function resolveValue($value); + public function resolveValue($value); } diff --git a/src/Symfony/Component/DependencyInjection/ScopeInterface.php b/src/Symfony/Component/DependencyInjection/ScopeInterface.php index 42ac3e212c..8bf6c9358f 100644 --- a/src/Symfony/Component/DependencyInjection/ScopeInterface.php +++ b/src/Symfony/Component/DependencyInjection/ScopeInterface.php @@ -23,10 +23,10 @@ interface ScopeInterface /** * @api */ - function getName(); + public function getName(); /** * @api */ - function getParentName(); + public function getParentName(); } diff --git a/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php b/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php index 457d54fa1c..d154602fd3 100644 --- a/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php +++ b/src/Symfony/Component/DependencyInjection/SimpleXMLElement.php @@ -99,7 +99,7 @@ class SimpleXMLElement extends \SimpleXMLElement * * @return mixed */ - static public function phpize($value) + public static function phpize($value) { $value = (string) $value; $lowercaseValue = strtolower($value); diff --git a/src/Symfony/Component/DependencyInjection/TaggedContainerInterface.php b/src/Symfony/Component/DependencyInjection/TaggedContainerInterface.php index 81adb2096d..3b4881703c 100644 --- a/src/Symfony/Component/DependencyInjection/TaggedContainerInterface.php +++ b/src/Symfony/Component/DependencyInjection/TaggedContainerInterface.php @@ -29,5 +29,5 @@ interface TaggedContainerInterface extends ContainerInterface * * @api */ - function findTaggedServiceIds($name); + public function findTaggedServiceIds($name); } diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index 54be73a303..02e07c8e6f 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -643,7 +643,7 @@ class Crawler extends \SplObjectStorage * @return string Converted string * */ - static public function xpathLiteral($s) + public static function xpathLiteral($s) { if (false === strpos($s, "'")) { return sprintf("'%s'", $s); diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php index fa44e6e0b5..2ba54465ed 100644 --- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php +++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php @@ -33,7 +33,7 @@ interface EventDispatcherInterface * * @api */ - function dispatch($eventName, Event $event = null); + public function dispatch($eventName, Event $event = null); /** * Adds an event listener that listens on the specified events. @@ -45,7 +45,7 @@ interface EventDispatcherInterface * * @api */ - function addListener($eventName, $listener, $priority = 0); + public function addListener($eventName, $listener, $priority = 0); /** * Adds an event subscriber. @@ -57,7 +57,7 @@ interface EventDispatcherInterface * * @api */ - function addSubscriber(EventSubscriberInterface $subscriber); + public function addSubscriber(EventSubscriberInterface $subscriber); /** * Removes an event listener from the specified events. @@ -65,14 +65,14 @@ interface EventDispatcherInterface * @param string|array $eventName The event(s) to remove a listener from * @param callable $listener The listener to remove */ - function removeListener($eventName, $listener); + public function removeListener($eventName, $listener); /** * Removes an event subscriber. * * @param EventSubscriberInterface $subscriber The subscriber */ - function removeSubscriber(EventSubscriberInterface $subscriber); + public function removeSubscriber(EventSubscriberInterface $subscriber); /** * Gets the listeners of a specific event or all listeners. @@ -81,7 +81,7 @@ interface EventDispatcherInterface * * @return array The event listeners for the specified event, or all event listeners by event name */ - function getListeners($eventName = null); + public function getListeners($eventName = null); /** * Checks whether an event has any registered listeners. @@ -90,5 +90,5 @@ interface EventDispatcherInterface * * @return Boolean true if the specified event has any listeners, false otherwise */ - function hasListeners($eventName = null); + public function hasListeners($eventName = null); } diff --git a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php index a9176e2e55..b3eaf48ac0 100644 --- a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php +++ b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php @@ -43,5 +43,5 @@ interface EventSubscriberInterface * * @api */ - static function getSubscribedEvents(); + public static function getSubscribedEvents(); } diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php index 4bb813bef6..a8f30cab75 100644 --- a/src/Symfony/Component/Finder/Finder.php +++ b/src/Symfony/Component/Finder/Finder.php @@ -45,7 +45,7 @@ class Finder implements \IteratorAggregate private $dates = array(); private $iterators = array(); - static private $vcsPatterns = array('.svn', '_svn', 'CVS', '_darcs', '.arch-params', '.monotone', '.bzr', '.git', '.hg'); + private static $vcsPatterns = array('.svn', '_svn', 'CVS', '_darcs', '.arch-params', '.monotone', '.bzr', '.git', '.hg'); /** * Constructor. @@ -62,7 +62,7 @@ class Finder implements \IteratorAggregate * * @api */ - static public function create() + public static function create() { return new self(); } @@ -273,7 +273,7 @@ class Finder implements \IteratorAggregate return $this; } - static public function addVCSPattern($pattern) + public static function addVCSPattern($pattern) { self::$vcsPatterns[] = $pattern; } diff --git a/src/Symfony/Component/Finder/Glob.php b/src/Symfony/Component/Finder/Glob.php index 5e31b75dbd..dd26384ed7 100644 --- a/src/Symfony/Component/Finder/Glob.php +++ b/src/Symfony/Component/Finder/Glob.php @@ -44,7 +44,7 @@ class Glob * * @return string regex The regexp */ - static public function toRegex($glob, $strictLeadingDot = true, $strictWildcardSlash = true) + public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardSlash = true) { $firstByte = true; $escaping = false; diff --git a/src/Symfony/Component/Form/DataMapperInterface.php b/src/Symfony/Component/Form/DataMapperInterface.php index 68c8ad0b8d..32b8d4b341 100644 --- a/src/Symfony/Component/Form/DataMapperInterface.php +++ b/src/Symfony/Component/Form/DataMapperInterface.php @@ -13,11 +13,11 @@ namespace Symfony\Component\Form; interface DataMapperInterface { - function mapDataToForms($data, array $forms); + public function mapDataToForms($data, array $forms); - function mapDataToForm($data, FormInterface $form); + public function mapDataToForm($data, FormInterface $form); - function mapFormsToData(array $forms, &$data); + public function mapFormsToData(array $forms, &$data); - function mapFormToData(FormInterface $form, &$data); + public function mapFormToData(FormInterface $form, &$data); } diff --git a/src/Symfony/Component/Form/DataTransformerInterface.php b/src/Symfony/Component/Form/DataTransformerInterface.php index 6451d6dd11..0513cc3dfb 100644 --- a/src/Symfony/Component/Form/DataTransformerInterface.php +++ b/src/Symfony/Component/Form/DataTransformerInterface.php @@ -46,7 +46,7 @@ interface DataTransformerInterface * @throws UnexpectedTypeException when the argument is not a string * @throws TransformationFailedException when the transformation fails */ - function transform($value); + public function transform($value); /** * Transforms a value from the transformed representation to its original @@ -73,5 +73,5 @@ interface DataTransformerInterface * @throws UnexpectedTypeException when the argument is not of the expected type * @throws TransformationFailedException when the transformation fails */ - function reverseTransform($value); + public function reverseTransform($value); } diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php index f9d0ab877e..4379a75fca 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php @@ -18,5 +18,5 @@ interface ChoiceListInterface * * @return array */ - function getChoices(); + public function getChoices(); } diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/TimezoneChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/TimezoneChoiceList.php index 57e7bb5863..3b68447d87 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/TimezoneChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/TimezoneChoiceList.php @@ -22,7 +22,7 @@ class TimezoneChoiceList implements ChoiceListInterface * Stores the available timezone choices * @var array */ - static protected $timezones; + protected static $timezones; /** * Returns the timezone choices. diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php index bad5a7746f..5e77003fdb 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php @@ -159,6 +159,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer $intlDateFormatter = new \IntlDateFormatter(\Locale::getDefault(), $dateFormat, $timeFormat, $timezone, $calendar, $pattern); $intlDateFormatter->setLenient(false); + return $intlDateFormatter; } } diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php index ddf474781c..c000ea12ba 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php @@ -30,7 +30,7 @@ class FixRadioInputListener implements EventSubscriberInterface $event->setData(strlen($data) < 1 ? array() : array($data => true)); } - static public function getSubscribedEvents() + public static function getSubscribedEvents() { return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData'); } diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php index b0d532cdf6..7309320c0c 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php @@ -38,7 +38,7 @@ class FixUrlProtocolListener implements EventSubscriberInterface } } - static public function getSubscribedEvents() + public static function getSubscribedEvents() { return array(FormEvents::BIND_NORM_DATA => 'onBindNormData'); } diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php index 0ca2b4a63d..a3a0ea4b8d 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php @@ -61,7 +61,7 @@ class ResizeFormListener implements EventSubscriberInterface $this->options = $options; } - static public function getSubscribedEvents() + public static function getSubscribedEvents() { return array( FormEvents::PRE_SET_DATA => 'preSetData', diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php index 220ad24781..eb65754a72 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php @@ -31,7 +31,7 @@ class TrimListener implements EventSubscriberInterface } } - static public function getSubscribedEvents() + public static function getSubscribedEvents() { return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData'); } diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php index 7a8bd99fd6..96640d27c8 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php @@ -80,7 +80,7 @@ class MoneyType extends AbstractType * The pattern contains the placeholder "{{ widget }}" where the HTML tag should * be inserted */ - static private function getPattern($currency) + private static function getPattern($currency) { if (!$currency) { return '{{ widget }}'; diff --git a/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php b/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php index 599f9e7769..992650d8f5 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php +++ b/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php @@ -104,7 +104,7 @@ class DelegatingValidator implements FormValidatorInterface * @param FormInterface $form The validated form * @param ExecutionContext $context The current validation context */ - static public function validateFormData(FormInterface $form, ExecutionContext $context) + public static function validateFormData(FormInterface $form, ExecutionContext $context) { if (is_object($form->getData()) || is_array($form->getData())) { $propertyPath = $context->getPropertyPath(); @@ -127,7 +127,7 @@ class DelegatingValidator implements FormValidatorInterface } } - static protected function getFormValidationGroups(FormInterface $form) + protected static function getFormValidationGroups(FormInterface $form) { $groups = null; diff --git a/src/Symfony/Component/Form/FormExtensionInterface.php b/src/Symfony/Component/Form/FormExtensionInterface.php index f20b681333..8fd17df4b9 100644 --- a/src/Symfony/Component/Form/FormExtensionInterface.php +++ b/src/Symfony/Component/Form/FormExtensionInterface.php @@ -23,7 +23,7 @@ interface FormExtensionInterface * * @return FormTypeInterface The type */ - function getType($name); + public function getType($name); /** * Returns whether the given type is supported. @@ -32,7 +32,7 @@ interface FormExtensionInterface * * @return Boolean Whether the type is supported by this extension */ - function hasType($name); + public function hasType($name); /** * Returns the extensions for the given type. @@ -41,7 +41,7 @@ interface FormExtensionInterface * * @return array An array of extensions as FormTypeExtensionInterface instances */ - function getTypeExtensions($name); + public function getTypeExtensions($name); /** * Returns whether this extension provides type extensions for the given type. @@ -50,12 +50,12 @@ interface FormExtensionInterface * * @return Boolean Whether the given type has extensions */ - function hasTypeExtensions($name); + public function hasTypeExtensions($name); /** * Returns the type guesser provided by this extension. * * @return FormTypeGuesserInterface|null The type guesser */ - function getTypeGuesser(); + public function getTypeGuesser(); } diff --git a/src/Symfony/Component/Form/FormFactoryInterface.php b/src/Symfony/Component/Form/FormFactoryInterface.php index acc9e99479..21590e1c85 100644 --- a/src/Symfony/Component/Form/FormFactoryInterface.php +++ b/src/Symfony/Component/Form/FormFactoryInterface.php @@ -26,7 +26,7 @@ interface FormFactoryInterface * * @throws FormException if any given option is not applicable to the given type */ - function create($type, $data = null, array $options = array()); + public function create($type, $data = null, array $options = array()); /** * Returns a form. @@ -40,7 +40,7 @@ interface FormFactoryInterface * * @throws FormException if any given option is not applicable to the given type */ - function createNamed($type, $name, $data = null, array $options = array()); + public function createNamed($type, $name, $data = null, array $options = array()); /** * Returns a form for a property of a class. @@ -54,7 +54,7 @@ interface FormFactoryInterface * * @throws FormException if any given option is not applicable to the form type */ - function createForProperty($class, $property, $data = null, array $options = array()); + public function createForProperty($class, $property, $data = null, array $options = array()); /** * Returns a form builder @@ -67,7 +67,7 @@ interface FormFactoryInterface * * @throws FormException if any given option is not applicable to the given type */ - function createBuilder($type, $data = null, array $options = array()); + public function createBuilder($type, $data = null, array $options = array()); /** * Returns a form builder. @@ -81,7 +81,7 @@ interface FormFactoryInterface * * @throws FormException if any given option is not applicable to the given type */ - function createNamedBuilder($type, $name, $data = null, array $options = array()); + public function createNamedBuilder($type, $name, $data = null, array $options = array()); /** * Returns a form builder for a property of a class. @@ -98,11 +98,11 @@ interface FormFactoryInterface * * @throws FormException if any given option is not applicable to the form type */ - function createBuilderForProperty($class, $property, $data = null, array $options = array()); + public function createBuilderForProperty($class, $property, $data = null, array $options = array()); - function getType($name); + public function getType($name); - function hasType($name); + public function hasType($name); - function addType(FormTypeInterface $type); + public function addType(FormTypeInterface $type); } diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php index b979274503..a4cee9f185 100644 --- a/src/Symfony/Component/Form/FormInterface.php +++ b/src/Symfony/Component/Form/FormInterface.php @@ -23,28 +23,28 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * * @param FormInterface $parent The parent form */ - function setParent(FormInterface $parent = null); + public function setParent(FormInterface $parent = null); /** * Returns the parent form. * * @return FormInterface The parent form */ - function getParent(); + public function getParent(); /** * Returns whether the form has a parent. * * @return Boolean */ - function hasParent(); + public function hasParent(); /** * Adds a child to the form. * * @param FormInterface $child The FormInterface to add as a child */ - function add(FormInterface $child); + public function add(FormInterface $child); /** * Returns whether a child with the given name exists. @@ -53,35 +53,35 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * * @return Boolean */ - function has($name); + public function has($name); /** * Removes a child from the form. * * @param string $name The name of the child to remove */ - function remove($name); + public function remove($name); /** * Returns all children in this group. * * @return array An array of FormInterface instances */ - function getChildren(); + public function getChildren(); /** * Return whether the form has children. * * @return Boolean */ - function hasChildren(); + public function hasChildren(); /** * Returns all errors. * * @return array An array of FormError instances that occurred during binding */ - function getErrors(); + public function getErrors(); /** * Updates the field with default data. @@ -90,14 +90,14 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * * @return Form The current form */ - function setData($appData); + public function setData($appData); /** * Returns the data in the format needed for the underlying object. * * @return mixed */ - function getData(); + public function getData(); /** * Returns the normalized data of the field. @@ -106,56 +106,56 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * When the field is bound, the normalized bound data is * returned if the field is valid, null otherwise. */ - function getNormData(); + public function getNormData(); /** * Returns the data transformed by the value transformer. * * @return string */ - function getClientData(); + public function getClientData(); /** * Returns the extra data. * * @return array The bound data which do not belong to a child */ - function getExtraData(); + public function getExtraData(); /** * Returns whether the field is bound. * * @return Boolean true if the form is bound to input values, false otherwise */ - function isBound(); + public function isBound(); /** * Returns the supported types. * * @return array An array of FormTypeInterface */ - function getTypes(); + public function getTypes(); /** * Returns the name by which the form is identified in forms. * * @return string The name of the form. */ - function getName(); + public function getName(); /** * Adds an error to this form. * * @param FormError $error */ - function addError(FormError $error); + public function addError(FormError $error); /** * Returns whether the form is valid. * * @return Boolean */ - function isValid(); + public function isValid(); /** * Returns whether the form is required to be filled out. @@ -166,7 +166,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * * @return Boolean */ - function isRequired(); + public function isRequired(); /** * Returns whether this form can be read only. @@ -179,56 +179,56 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * * @return Boolean */ - function isReadOnly(); + public function isReadOnly(); /** * Returns whether the form is empty. * * @return Boolean */ - function isEmpty(); + public function isEmpty(); /** * Returns whether the data in the different formats is synchronized. * * @return Boolean */ - function isSynchronized(); + public function isSynchronized(); /** * Writes data into the form. * * @param mixed $data The data */ - function bind($data); + public function bind($data); /** * Returns whether the form has an attribute with the given name. * * @param string $name The name of the attribute */ - function hasAttribute($name); + public function hasAttribute($name); /** * Returns the value of the attributes with the given name. * * @param string $name The name of the attribute */ - function getAttribute($name); + public function getAttribute($name); /** * Returns the root of the form tree. * * @return FormInterface The root of the tree */ - function getRoot(); + public function getRoot(); /** * Returns whether the field is the root of the form tree. * * @return Boolean */ - function isRoot(); + public function isRoot(); /** * Creates a view. @@ -237,5 +237,5 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable * * @return FormView The view */ - function createView(FormView $parent = null); + public function createView(FormView $parent = null); } diff --git a/src/Symfony/Component/Form/FormTypeExtensionInterface.php b/src/Symfony/Component/Form/FormTypeExtensionInterface.php index 68682f1a2e..363f939a83 100644 --- a/src/Symfony/Component/Form/FormTypeExtensionInterface.php +++ b/src/Symfony/Component/Form/FormTypeExtensionInterface.php @@ -24,7 +24,7 @@ interface FormTypeExtensionInterface * @param FormBuilder $builder The form builder * @param array $options The options */ - function buildForm(FormBuilder $builder, array $options); + public function buildForm(FormBuilder $builder, array $options); /** * Builds the view. @@ -37,7 +37,7 @@ interface FormTypeExtensionInterface * @param FormView $view The view * @param FormInterface $form The form */ - function buildView(FormView $view, FormInterface $form); + public function buildView(FormView $view, FormInterface $form); /** * Builds the view. @@ -50,7 +50,7 @@ interface FormTypeExtensionInterface * @param FormView $view The view * @param FormInterface $form The form */ - function buildViewBottomUp(FormView $view, FormInterface $form); + public function buildViewBottomUp(FormView $view, FormInterface $form); /** * Overrides the default options form the extended type. @@ -59,7 +59,7 @@ interface FormTypeExtensionInterface * * @return array */ - function getDefaultOptions(array $options); + public function getDefaultOptions(array $options); /** * Returns the allowed option values for each option (if any). @@ -68,13 +68,12 @@ interface FormTypeExtensionInterface * * @return array The allowed option values */ - function getAllowedOptionValues(array $options); - + public function getAllowedOptionValues(array $options); /** * Returns the name of the type being extended * * @return string The name of the type being extended */ - function getExtendedType(); + public function getExtendedType(); } diff --git a/src/Symfony/Component/Form/FormTypeGuesserInterface.php b/src/Symfony/Component/Form/FormTypeGuesserInterface.php index 9679ccf690..035ba1f0a7 100644 --- a/src/Symfony/Component/Form/FormTypeGuesserInterface.php +++ b/src/Symfony/Component/Form/FormTypeGuesserInterface.php @@ -21,7 +21,7 @@ interface FormTypeGuesserInterface * * @return TypeGuess A guess for the field's type and options */ - function guessType($class, $property); + public function guessType($class, $property); /** * Returns a guess whether a property of a class is required @@ -31,7 +31,7 @@ interface FormTypeGuesserInterface * * @return Guess A guess for the field's required setting */ - function guessRequired($class, $property); + public function guessRequired($class, $property); /** * Returns a guess about the field's maximum length @@ -41,7 +41,7 @@ interface FormTypeGuesserInterface * * @return Guess A guess for the field's maximum length */ - function guessMaxLength($class, $property); + public function guessMaxLength($class, $property); /** * Returns a guess about the field's minimum length @@ -51,6 +51,6 @@ interface FormTypeGuesserInterface * * @return Guess A guess for the field's minimum length */ - function guessMinLength($class, $property); + public function guessMinLength($class, $property); } diff --git a/src/Symfony/Component/Form/FormTypeInterface.php b/src/Symfony/Component/Form/FormTypeInterface.php index a490d7c078..4180271ddc 100644 --- a/src/Symfony/Component/Form/FormTypeInterface.php +++ b/src/Symfony/Component/Form/FormTypeInterface.php @@ -25,7 +25,7 @@ interface FormTypeInterface * @param FormBuilder $builder The form builder * @param array $options The options */ - function buildForm(FormBuilder $builder, array $options); + public function buildForm(FormBuilder $builder, array $options); /** * Builds the form view. @@ -39,7 +39,7 @@ interface FormTypeInterface * @param FormView $view The view * @param FormInterface $form The form */ - function buildView(FormView $view, FormInterface $form); + public function buildView(FormView $view, FormInterface $form); /** * Builds the form view. @@ -56,7 +56,7 @@ interface FormTypeInterface * @param FormView $view The view * @param FormInterface $form The form */ - function buildViewBottomUp(FormView $view, FormInterface $form); + public function buildViewBottomUp(FormView $view, FormInterface $form); /** * Returns a builder for the current type. @@ -70,7 +70,7 @@ interface FormTypeInterface * * @return FormBuilder|null A form builder or null when the type does not have a builder */ - function createBuilder($name, FormFactoryInterface $factory, array $options); + public function createBuilder($name, FormFactoryInterface $factory, array $options); /** * Returns the default options for this type. @@ -79,7 +79,7 @@ interface FormTypeInterface * * @return array The default options */ - function getDefaultOptions(array $options); + public function getDefaultOptions(array $options); /** * Returns the allowed option values for each option (if any). @@ -88,7 +88,7 @@ interface FormTypeInterface * * @return array The allowed option values */ - function getAllowedOptionValues(array $options); + public function getAllowedOptionValues(array $options); /** * Returns the name of the parent type. @@ -97,14 +97,14 @@ interface FormTypeInterface * * @return string|null The name of the parent type if any otherwise null */ - function getParent(array $options); + public function getParent(array $options); /** * Returns the name of this type. * * @return string The name of this type */ - function getName(); + public function getName(); /** * Adds extensions for this type. @@ -113,12 +113,12 @@ interface FormTypeInterface * * @throws UnexpectedTypeException if any extension does not implement FormTypeExtensionInterface */ - function setExtensions(array $extensions); + public function setExtensions(array $extensions); /** * Returns the extensions associated with this type. * * @return array An array of FormTypeExtensionInterface */ - function getExtensions(); + public function getExtensions(); } diff --git a/src/Symfony/Component/Form/FormValidatorInterface.php b/src/Symfony/Component/Form/FormValidatorInterface.php index 913f33a0b4..e6eac458ed 100644 --- a/src/Symfony/Component/Form/FormValidatorInterface.php +++ b/src/Symfony/Component/Form/FormValidatorInterface.php @@ -13,5 +13,5 @@ namespace Symfony\Component\Form; interface FormValidatorInterface { - function validate(FormInterface $form); + public function validate(FormInterface $form); } diff --git a/src/Symfony/Component/Form/Guess/Guess.php b/src/Symfony/Component/Form/Guess/Guess.php index 95e9c27926..2db79827ab 100644 --- a/src/Symfony/Component/Form/Guess/Guess.php +++ b/src/Symfony/Component/Form/Guess/Guess.php @@ -69,7 +69,7 @@ abstract class Guess * * @return Guess The guess with the highest confidence */ - static public function getBestGuess(array $guesses) + public static function getBestGuess(array $guesses) { usort($guesses, function ($a, $b) { return $b->getConfidence() - $a->getConfidence(); diff --git a/src/Symfony/Component/Form/Util/FormUtil.php b/src/Symfony/Component/Form/Util/FormUtil.php index bc521efff2..f852118e59 100644 --- a/src/Symfony/Component/Form/Util/FormUtil.php +++ b/src/Symfony/Component/Form/Util/FormUtil.php @@ -13,7 +13,7 @@ namespace Symfony\Component\Form\Util; abstract class FormUtil { - static public function toArrayKey($value) + public static function toArrayKey($value) { if (is_bool($value) || (string) (int) $value === (string) $value) { return (int) $value; @@ -22,7 +22,7 @@ abstract class FormUtil return (string) $value; } - static public function toArrayKeys(array $array) + public static function toArrayKeys(array $array) { return array_map(array(__CLASS__, 'toArrayKey'), $array); } @@ -34,7 +34,7 @@ abstract class FormUtil * * @return Boolean Whether the choice is a group */ - static public function isChoiceGroup($choice) + public static function isChoiceGroup($choice) { return is_array($choice) || $choice instanceof \Traversable; } @@ -47,7 +47,7 @@ abstract class FormUtil * * @return Boolean Whether the choice is selected */ - static public function isChoiceSelected($choice, $value) + public static function isChoiceSelected($choice, $value) { $choice = static::toArrayKey($choice); diff --git a/src/Symfony/Component/HttpFoundation/File/File.php b/src/Symfony/Component/HttpFoundation/File/File.php index 58bc6f4f1a..ab36616102 100644 --- a/src/Symfony/Component/HttpFoundation/File/File.php +++ b/src/Symfony/Component/HttpFoundation/File/File.php @@ -29,7 +29,7 @@ class File extends \SplFileInfo * * @var array */ - static protected $defaultExtensions = array( + protected static $defaultExtensions = array( 'application/andrew-inset' => 'ez', 'application/appledouble' => 'base64', 'application/applefile' => 'base64', diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/ContentTypeMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/ContentTypeMimeTypeGuesser.php index fb900b2bc2..25331a8f9b 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/ContentTypeMimeTypeGuesser.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/ContentTypeMimeTypeGuesser.php @@ -26,7 +26,7 @@ class ContentTypeMimeTypeGuesser implements MimeTypeGuesserInterface * * @return Boolean */ - static public function isSupported() + public static function isSupported() { return function_exists('mime_content_type'); } diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php index 1b869f22cb..115d95deef 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php @@ -26,7 +26,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface * * @return Boolean */ - static public function isSupported() + public static function isSupported() { return !strstr(PHP_OS, 'WIN'); } diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php index 45d5a086ed..62be161e66 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php @@ -26,7 +26,7 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface * * @return Boolean */ - static public function isSupported() + public static function isSupported() { return function_exists('finfo_open'); } diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php index fed2d6819f..eb72b19d1e 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php @@ -36,7 +36,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface * The singleton instance * @var MimeTypeGuesser */ - static private $instance = null; + private static $instance = null; /** * All registered MimeTypeGuesserInterface instances @@ -49,7 +49,7 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface * * @return MimeTypeGuesser */ - static public function getInstance() + public static function getInstance() { if (null === self::$instance) { self::$instance = new self(); diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php index ddb8c69aa7..d1bf1dba02 100644 --- a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php +++ b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php @@ -28,5 +28,5 @@ interface MimeTypeGuesserInterface * @throws FileNotFoundException If the file does not exist * @throws AccessDeniedException If the file could not be read */ - function guess($path); + public function guess($path); } diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php index dcd2919773..e3469ade06 100644 --- a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php +++ b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php @@ -203,7 +203,7 @@ class UploadedFile extends File * * @return type The maximum size of an uploaded file in bytes */ - static public function getMaxFilesize() + public static function getMaxFilesize() { $max = trim(ini_get('upload_max_filesize')); diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php index 0f85eb05b3..524a53b2a5 100644 --- a/src/Symfony/Component/HttpFoundation/FileBag.php +++ b/src/Symfony/Component/HttpFoundation/FileBag.php @@ -23,7 +23,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile; */ class FileBag extends ParameterBag { - static private $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type'); + private static $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type'); /** * Constructor. diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index e20d5dd76d..b88139a37f 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -20,7 +20,7 @@ namespace Symfony\Component\HttpFoundation; */ class Request { - static protected $trustProxy = false; + protected static $trustProxy = false; /** * @var \Symfony\Component\HttpFoundation\ParameterBag @@ -83,7 +83,7 @@ class Request protected $format; protected $session; - static protected $formats; + protected static $formats; /** * Constructor. @@ -147,7 +147,7 @@ class Request * * @api */ - static public function createFromGlobals() + public static function createFromGlobals() { $request = new static($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER); @@ -176,7 +176,7 @@ class Request * * @api */ - static public function create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null) + public static function create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null) { $defaults = array( 'SERVER_NAME' => 'localhost', @@ -362,7 +362,7 @@ class Request * * @api */ - static public function trustProxyData() + public static function trustProxyData() { self::$trustProxy = true; } @@ -1227,7 +1227,7 @@ class Request /** * Initializes HTTP request formats. */ - static protected function initializeFormats() + protected static function initializeFormats() { static::$formats = array( 'html' => array('text/html', 'application/xhtml+xml'), diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcherInterface.php b/src/Symfony/Component/HttpFoundation/RequestMatcherInterface.php index 0ee161c884..695fd21788 100644 --- a/src/Symfony/Component/HttpFoundation/RequestMatcherInterface.php +++ b/src/Symfony/Component/HttpFoundation/RequestMatcherInterface.php @@ -29,5 +29,5 @@ interface RequestMatcherInterface * * @api */ - function matches(Request $request); + public function matches(Request $request); } diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index 96022f0310..a82d40484e 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -31,7 +31,7 @@ class Response protected $statusText; protected $charset; - static public $statusTexts = array( + public static $statusTexts = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php index de96508910..2009b85b36 100644 --- a/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php @@ -20,8 +20,8 @@ namespace Symfony\Component\HttpFoundation\SessionStorage; */ class NativeSessionStorage implements SessionStorageInterface { - static protected $sessionIdRegenerated = false; - static protected $sessionStarted = false; + protected static $sessionIdRegenerated = false; + protected static $sessionStarted = false; protected $options; diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/SessionStorage/SessionStorageInterface.php index 0b220a1068..8045575211 100644 --- a/src/Symfony/Component/HttpFoundation/SessionStorage/SessionStorageInterface.php +++ b/src/Symfony/Component/HttpFoundation/SessionStorage/SessionStorageInterface.php @@ -25,7 +25,7 @@ interface SessionStorageInterface * * @api */ - function start(); + public function start(); /** * Returns the session ID @@ -36,7 +36,7 @@ interface SessionStorageInterface * * @api */ - function getId(); + public function getId(); /** * Reads data from this storage. @@ -51,7 +51,7 @@ interface SessionStorageInterface * * @api */ - function read($key); + public function read($key); /** * Removes data from this storage. @@ -66,7 +66,7 @@ interface SessionStorageInterface * * @api */ - function remove($key); + public function remove($key); /** * Writes data to this storage. @@ -80,7 +80,7 @@ interface SessionStorageInterface * * @api */ - function write($key, $data); + public function write($key, $data); /** * Regenerates id that represents this storage. @@ -93,5 +93,5 @@ interface SessionStorageInterface * * @api */ - function regenerate($destroy = false); + public function regenerate($destroy = false); } diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php index 99d591f9e3..4d7a3bca9c 100644 --- a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php +++ b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php @@ -27,14 +27,14 @@ interface BundleInterface * * @api */ - function boot(); + public function boot(); /** * Shutdowns the Bundle. * * @api */ - function shutdown(); + public function shutdown(); /** * Builds the bundle. @@ -45,7 +45,7 @@ interface BundleInterface * * @api */ - function build(ContainerBuilder $container); + public function build(ContainerBuilder $container); /** * Returns the container extension that should be implicitly loaded. @@ -54,7 +54,7 @@ interface BundleInterface * * @api */ - function getContainerExtension(); + public function getContainerExtension(); /** * Returns the bundle parent name. @@ -63,7 +63,7 @@ interface BundleInterface * * @api */ - function getParent(); + public function getParent(); /** * Returns the bundle name (the class short name). @@ -72,7 +72,7 @@ interface BundleInterface * * @api */ - function getName(); + public function getName(); /** * Gets the Bundle namespace. @@ -81,7 +81,7 @@ interface BundleInterface * * @api */ - function getNamespace(); + public function getNamespace(); /** * Gets the Bundle directory path. @@ -92,5 +92,5 @@ interface BundleInterface * * @api */ - function getPath(); + public function getPath(); } diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php index 2039f22ee2..0cfc94e993 100644 --- a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php +++ b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php @@ -23,7 +23,7 @@ interface CacheWarmerInterface * * @param string $cacheDir The cache directory */ - function warmUp($cacheDir); + public function warmUp($cacheDir); /** * Checks whether this warmer is optional or not. @@ -35,5 +35,5 @@ interface CacheWarmerInterface * * @return Boolean true if the warmer is optional, false otherwise */ - function isOptional(); + public function isOptional(); } diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php index 986a13dca4..f58f50db53 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php +++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php @@ -45,7 +45,7 @@ interface ControllerResolverInterface * * @api */ - function getController(Request $request); + public function getController(Request $request); /** * Returns the arguments to pass to the controller. @@ -59,5 +59,5 @@ interface ControllerResolverInterface * * @api */ - function getArguments(Request $request, $controller); + public function getArguments(Request $request, $controller); } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php index 7da36b678d..98eabdb516 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpKernel\DataCollector; - /** * DataCollector. * diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php index 7cfbbd132f..cf4cdfd771 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php @@ -32,7 +32,7 @@ interface DataCollectorInterface * * @api */ - function collect(Request $request, Response $response, \Exception $exception = null); + public function collect(Request $request, Response $response, \Exception $exception = null); /** * Returns the name of the collector. @@ -41,5 +41,5 @@ interface DataCollectorInterface * * @api */ - function getName(); + public function getName(); } diff --git a/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php b/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php index a2466d609f..a765103959 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php +++ b/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php @@ -39,7 +39,7 @@ class ErrorHandler * * @return The registered error handler */ - static public function register($level = null) + public static function register($level = null) { $handler = new static(); $handler->setLevel($level); diff --git a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php index 02cb99d498..6e99c90654 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php @@ -40,7 +40,7 @@ class ExceptionHandler * * @return The registered exception handler */ - static public function register($debug = true) + public static function register($debug = true) { $handler = new static($debug); diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcherInterface.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcherInterface.php index 622acd652a..927be204bb 100644 --- a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcherInterface.php +++ b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcherInterface.php @@ -21,12 +21,12 @@ interface TraceableEventDispatcherInterface * * @return array An array of called listeners */ - function getCalledListeners(); + public function getCalledListeners(); /** * Gets the not called listeners. * * @return array An array of not called listeners */ - function getNotCalledListeners(); + public function getNotCalledListeners(); } diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php b/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php index 5689269fe6..61e0a038e5 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php @@ -94,7 +94,7 @@ abstract class Extension implements ExtensionInterface return Container::underscore($classBaseName); } - protected final function processConfiguration(ConfigurationInterface $configuration, array $configs) + final protected function processConfiguration(ConfigurationInterface $configuration, array $configs) { $processor = new Processor(); diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php index 80ddc2e7a4..5acdde12f3 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php @@ -146,4 +146,3 @@ class ProfilerListener } } } - diff --git a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php index 0c1844cdd0..50e83bd509 100644 --- a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php +++ b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php @@ -28,7 +28,7 @@ class FlattenException private $statusCode; private $headers; - static public function create(\Exception $exception, $statusCode = 500, array $headers = array()) + public static function create(\Exception $exception, $statusCode = 500, array $headers = array()) { $e = new static(); $e->setMessage($exception->getMessage()); diff --git a/src/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php b/src/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php index 11102bdb8d..dd4a9dc5a3 100644 --- a/src/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php +++ b/src/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php @@ -23,12 +23,12 @@ interface HttpExceptionInterface * * @return integer An HTTP response status code */ - function getStatusCode(); + public function getStatusCode(); /** * Returns response headers. * * @return array Response headers */ - function getHeaders(); + public function getHeaders(); } diff --git a/src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php index 7b1d38795e..0fb8a12436 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php @@ -30,12 +30,12 @@ interface EsiResponseCacheStrategyInterface * * @param Response $response */ - function add(Response $response); + public function add(Response $response); /** * Updates the Response HTTP headers based on the embedded Responses. * * @param Response $response */ - function update(Response $response); + public function update(Response $response); } diff --git a/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php index 58f8a8c1d9..dd8c886979 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php @@ -31,7 +31,7 @@ interface StoreInterface * * @return Response|null A Response instance, or null if no cache entry was found */ - function lookup(Request $request); + public function lookup(Request $request); /** * Writes a cache entry to the store for the given Request and Response. @@ -44,14 +44,14 @@ interface StoreInterface * * @return string The key under which the response is stored */ - function write(Request $request, Response $response); + public function write(Request $request, Response $response); /** * Invalidates all cache entries that match the request. * * @param Request $request A Request instance */ - function invalidate(Request $request); + public function invalidate(Request $request); /** * Locks the cache for a given Request. @@ -60,14 +60,14 @@ interface StoreInterface * * @return Boolean|string true if the lock is acquired, the path to the current lock otherwise */ - function lock(Request $request); + public function lock(Request $request); /** * Releases the lock for the given Request. * * @param Request $request A Request instance */ - function unlock(Request $request); + public function unlock(Request $request); /** * Purges data for the given URL. @@ -76,10 +76,10 @@ interface StoreInterface * * @return Boolean true if the URL exists and has been purged, false otherwise */ - function purge($url); + public function purge($url); /** * Cleanups storage. */ - function cleanup(); + public function cleanup(); } diff --git a/src/Symfony/Component/HttpKernel/HttpKernelInterface.php b/src/Symfony/Component/HttpKernel/HttpKernelInterface.php index efcf39da91..f49d37ccb1 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernelInterface.php +++ b/src/Symfony/Component/HttpKernel/HttpKernelInterface.php @@ -43,5 +43,5 @@ interface HttpKernelInterface * * @api */ - function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true); + public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true); } diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 64c680345c..60f86a7e1b 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -706,7 +706,7 @@ abstract class Kernel implements KernelInterface * * @return string The PHP string with the comments removed */ - static public function stripComments($source) + public static function stripComments($source) { if (!function_exists('token_get_all')) { return $source; diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/Component/HttpKernel/KernelInterface.php index 4fb0abc0ad..c6f6c63223 100644 --- a/src/Symfony/Component/HttpKernel/KernelInterface.php +++ b/src/Symfony/Component/HttpKernel/KernelInterface.php @@ -34,7 +34,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function registerBundles(); + public function registerBundles(); /** * Loads the container configuration @@ -43,14 +43,14 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function registerContainerConfiguration(LoaderInterface $loader); + public function registerContainerConfiguration(LoaderInterface $loader); /** * Boots the current kernel. * * @api */ - function boot(); + public function boot(); /** * Shutdowns the kernel. @@ -59,7 +59,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function shutdown(); + public function shutdown(); /** * Gets the registered bundle instances. @@ -68,7 +68,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function getBundles(); + public function getBundles(); /** * Checks if a given class name belongs to an active bundle. @@ -79,7 +79,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function isClassInActiveBundle($class); + public function isClassInActiveBundle($class); /** * Returns a bundle and optionally its descendants by its name. @@ -93,7 +93,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function getBundle($name, $first = true); + public function getBundle($name, $first = true); /** * Returns the file path for a given resource. @@ -123,7 +123,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function locateResource($name, $dir = null, $first = true); + public function locateResource($name, $dir = null, $first = true); /** * Gets the name of the kernel @@ -132,7 +132,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function getName(); + public function getName(); /** * Gets the environment. @@ -141,7 +141,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function getEnvironment(); + public function getEnvironment(); /** * Checks if debug mode is enabled. @@ -150,7 +150,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function isDebug(); + public function isDebug(); /** * Gets the application root dir. @@ -159,7 +159,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function getRootDir(); + public function getRootDir(); /** * Gets the current container. @@ -168,7 +168,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function getContainer(); + public function getContainer(); /** * Gets the request start time (not available if debug is disabled). @@ -177,7 +177,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function getStartTime(); + public function getStartTime(); /** * Gets the cache directory. @@ -186,7 +186,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function getCacheDir(); + public function getCacheDir(); /** * Gets the log directory. @@ -195,5 +195,5 @@ interface KernelInterface extends HttpKernelInterface, \Serializable * * @api */ - function getLogDir(); + public function getLogDir(); } diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php index 65bb25a864..4442c6398e 100644 --- a/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php +++ b/src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php @@ -27,12 +27,12 @@ interface DebugLoggerInterface * * @return array An array of logs */ - function getLogs(); + public function getLogs(); /** * Returns the number of errors. * * @return integer The number of errors */ - function countErrors(); + public function countErrors(); } diff --git a/src/Symfony/Component/HttpKernel/Log/LoggerInterface.php b/src/Symfony/Component/HttpKernel/Log/LoggerInterface.php index 97fe65b912..34847c8098 100644 --- a/src/Symfony/Component/HttpKernel/Log/LoggerInterface.php +++ b/src/Symfony/Component/HttpKernel/Log/LoggerInterface.php @@ -23,40 +23,40 @@ interface LoggerInterface /** * @api */ - function emerg($message, array $context = array()); + public function emerg($message, array $context = array()); /** * @api */ - function alert($message, array $context = array()); + public function alert($message, array $context = array()); /** * @api */ - function crit($message, array $context = array()); + public function crit($message, array $context = array()); /** * @api */ - function err($message, array $context = array()); + public function err($message, array $context = array()); /** * @api */ - function warn($message, array $context = array()); + public function warn($message, array $context = array()); /** * @api */ - function notice($message, array $context = array()); + public function notice($message, array $context = array()); /** * @api */ - function info($message, array $context = array()); + public function info($message, array $context = array()); /** * @api */ - function debug($message, array $context = array()); + public function debug($message, array $context = array()); } diff --git a/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php index 118abba3ce..0d0b7e96ec 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpKernel\Profiler; - /** * Base PDO storage for profiling information in a PDO database. * diff --git a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php index f4209a3aa4..e89c1fb37c 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php +++ b/src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php @@ -27,7 +27,7 @@ interface ProfilerStorageInterface * * @return array An array of tokens */ - function find($ip, $url, $limit); + public function find($ip, $url, $limit); /** * Reads data associated with the given token. @@ -38,7 +38,7 @@ interface ProfilerStorageInterface * * @return Profile The profile associated with token */ - function read($token); + public function read($token); /** * Write data associated with the given token. @@ -47,10 +47,10 @@ interface ProfilerStorageInterface * * @return Boolean Write operation successful */ - function write(Profile $profile); + public function write(Profile $profile); /** * Purges all data from the database. */ - function purge(); + public function purge(); } diff --git a/src/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php index 5d7b93df98..df2ed980b0 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpKernel\Profiler; - /** * SqliteProfilerStorage stores profiling information in a SQLite database. * diff --git a/src/Symfony/Component/Locale/Locale.php b/src/Symfony/Component/Locale/Locale.php index 89387d6e86..0287705535 100644 --- a/src/Symfony/Component/Locale/Locale.php +++ b/src/Symfony/Component/Locale/Locale.php @@ -40,7 +40,7 @@ class Locale extends \Locale * * @throws RuntimeException When the resource bundles cannot be loaded */ - static public function getDisplayCountries($locale) + public static function getDisplayCountries($locale) { if (!isset(self::$countries[$locale])) { $bundle = \ResourceBundle::create($locale, __DIR__.'/Resources/data/region'); @@ -81,7 +81,7 @@ class Locale extends \Locale * @return array The country codes * @throws RuntimeException When the resource bundles cannot be loaded */ - static public function getCountries() + public static function getCountries() { return array_keys(self::getDisplayCountries(self::getDefault())); } @@ -95,7 +95,7 @@ class Locale extends \Locale * * @throws RuntimeException When the resource bundles cannot be loaded */ - static public function getDisplayLanguages($locale) + public static function getDisplayLanguages($locale) { if (!isset(self::$languages[$locale])) { $bundle = \ResourceBundle::create($locale, __DIR__.'/Resources/data/lang'); @@ -134,7 +134,7 @@ class Locale extends \Locale * @return array The language codes * @throws RuntimeException When the resource bundles cannot be loaded */ - static public function getLanguages() + public static function getLanguages() { return array_keys(self::getDisplayLanguages(self::getDefault())); } @@ -146,7 +146,7 @@ class Locale extends \Locale * @return array The locale names with their codes as keys * @throws RuntimeException When the resource bundles cannot be loaded */ - static public function getDisplayLocales($locale) + public static function getDisplayLocales($locale) { if (!isset(self::$locales[$locale])) { $bundle = \ResourceBundle::create($locale, __DIR__.'/Resources/data/names'); @@ -182,7 +182,7 @@ class Locale extends \Locale * @return array The locale codes * @throws RuntimeException When the resource bundles cannot be loaded */ - static public function getLocales() + public static function getLocales() { return array_keys(self::getDisplayLocales(self::getDefault())); } @@ -193,7 +193,7 @@ class Locale extends \Locale * @param $locale The locale to find the fallback for * @return string|null The fallback locale, or null if no parent exists */ - static protected function getFallbackLocale($locale) + protected static function getFallbackLocale($locale) { if ($locale === self::getDefault()) { return null; diff --git a/src/Symfony/Component/Locale/Resources/data/update-data.php b/src/Symfony/Component/Locale/Resources/data/update-data.php index 69f511aec0..f65eb99529 100644 --- a/src/Symfony/Component/Locale/Resources/data/update-data.php +++ b/src/Symfony/Component/Locale/Resources/data/update-data.php @@ -398,7 +398,6 @@ genrb($namesGeneratedDir, $namesDir); clear_directory($namesGeneratedDir); rmdir($namesGeneratedDir); - // Generate the data to the stubbed intl classes We only extract data for the 'en' locale // The extracted data is used only by the stub classes $defaultLocale = 'en'; diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php index 35386644a5..458fa8c750 100644 --- a/src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php +++ b/src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Locale\Stub\DateFormat; - /** * Parser and formatter for month format * @@ -22,7 +21,7 @@ class MonthTransformer extends Transformer /** * @var array */ - static protected $months = array( + protected static $months = array( 'January', 'February', 'March', @@ -41,19 +40,19 @@ class MonthTransformer extends Transformer * Short months names (first 3 letters) * @var array */ - static protected $shortMonths = array(); + protected static $shortMonths = array(); /** * Flipped $months array, $name => $index * @var array */ - static protected $flippedMonths = array(); + protected static $flippedMonths = array(); /** * Flipped $shortMonths array, $name => $index * @var array */ - static protected $flippedShortMonths = array(); + protected static $flippedShortMonths = array(); /** * Constructor diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php index ce37e349e8..e9cf0ebef9 100644 --- a/src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php +++ b/src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php @@ -74,7 +74,7 @@ class TimeZoneTransformer extends Transformer * @throws NotImplementedException When the GMT time zone have minutes offset different than zero * @throws InvalidArgumentException When the value can not be matched with pattern */ - static public function getEtcTimeZoneId($formattedTimeZone) + public static function getEtcTimeZoneId($formattedTimeZone) { if (preg_match('/GMT(?P[+-])(?P\d{2}):?(?P\d{2})/', $formattedTimeZone, $matches)) { $hours = (int) $matches['hours']; diff --git a/src/Symfony/Component/Locale/Stub/StubCollator.php b/src/Symfony/Component/Locale/Stub/StubCollator.php index 13f187d928..7f46288db3 100644 --- a/src/Symfony/Component/Locale/Stub/StubCollator.php +++ b/src/Symfony/Component/Locale/Stub/StubCollator.php @@ -76,7 +76,7 @@ class StubCollator * * @throws MethodArgumentValueNotImplementedException When $locale different than 'en' is passed */ - static public function create($locale) + public static function create($locale) { return new self($locale); } diff --git a/src/Symfony/Component/Locale/Stub/StubIntl.php b/src/Symfony/Component/Locale/Stub/StubIntl.php index c843d068ee..f199d2dfd8 100644 --- a/src/Symfony/Component/Locale/Stub/StubIntl.php +++ b/src/Symfony/Component/Locale/Stub/StubIntl.php @@ -71,7 +71,7 @@ abstract class StubIntl * * @return Boolean */ - static public function isFailure($errorCode) + public static function isFailure($errorCode) { return isset(self::$errorCodes[$errorCode]) && $errorCode > self::U_ZERO_ERROR; @@ -84,7 +84,7 @@ abstract class StubIntl * * @return integer */ - static public function getErrorCode() + public static function getErrorCode() { return self::$errorCode; } @@ -96,7 +96,7 @@ abstract class StubIntl * * @return string */ - static public function getErrorMessage() + public static function getErrorMessage() { return self::$errorMessage; } @@ -106,7 +106,7 @@ abstract class StubIntl * * @return string */ - static public function getErrorName($code) + public static function getErrorName($code) { if (isset(self::$errorCodes[$code])) { return self::$errorCodes[$code]; @@ -123,7 +123,7 @@ abstract class StubIntl * * @throws \InvalidArgumentException If the code is not one of the error constants in this class */ - static public function setError($code, $message = '') + public static function setError($code, $message = '') { if (!isset(self::$errorCodes[$code])) { throw new \InvalidArgumentException(sprintf('No such error code: "%s"', $code)); diff --git a/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php b/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php index d16bd667ff..2dc79d9d5f 100644 --- a/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php +++ b/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php @@ -155,7 +155,7 @@ class StubIntlDateFormatter * * @throws MethodArgumentValueNotImplementedException When $locale different than 'en' is passed */ - static public function create($locale, $datetype, $timetype, $timezone = null, $calendar = self::GREGORIAN, $pattern = null) + public static function create($locale, $datetype, $timetype, $timezone = null, $calendar = self::GREGORIAN, $pattern = null) { return new self($locale, $datetype, $timetype, $timezone, $calendar, $pattern); } diff --git a/src/Symfony/Component/Locale/Stub/StubLocale.php b/src/Symfony/Component/Locale/Stub/StubLocale.php index 5563d1304e..bf8d293dee 100644 --- a/src/Symfony/Component/Locale/Stub/StubLocale.php +++ b/src/Symfony/Component/Locale/Stub/StubLocale.php @@ -80,7 +80,7 @@ class StubLocale * * @throws InvalidArgumentException When the locale is different than 'en' */ - static public function getDisplayCountries($locale) + public static function getDisplayCountries($locale) { return self::getStubData($locale, 'countries', 'region'); } @@ -90,7 +90,7 @@ class StubLocale * * @return array The country codes */ - static public function getCountries() + public static function getCountries() { return array_keys(self::getDisplayCountries(self::getDefault())); } @@ -104,7 +104,7 @@ class StubLocale * * @throws InvalidArgumentException When the locale is different than 'en' */ - static public function getDisplayLanguages($locale) + public static function getDisplayLanguages($locale) { return self::getStubData($locale, 'languages', 'lang'); } @@ -114,7 +114,7 @@ class StubLocale * * @return array The language codes */ - static public function getLanguages() + public static function getLanguages() { return array_keys(self::getDisplayLanguages(self::getDefault())); } @@ -128,7 +128,7 @@ class StubLocale * * @throws InvalidArgumentException When the locale is different than 'en' */ - static public function getDisplayLocales($locale) + public static function getDisplayLocales($locale) { return self::getStubData($locale, 'locales', 'names'); } @@ -138,7 +138,7 @@ class StubLocale * * @return array The locale codes */ - static public function getLocales() + public static function getLocales() { return array_keys(self::getDisplayLocales(self::getDefault())); } @@ -150,7 +150,7 @@ class StubLocale * * @return array The currencies data */ - static public function getCurrenciesData($locale) + public static function getCurrenciesData($locale) { return self::getStubData($locale, 'currencies', 'curr'); } @@ -164,7 +164,7 @@ class StubLocale * * @throws InvalidArgumentException When the locale is different than 'en' */ - static public function getDisplayCurrencies($locale) + public static function getDisplayCurrencies($locale) { $currencies = self::getCurrenciesData($locale); @@ -184,7 +184,7 @@ class StubLocale * * @return array The currencies codes */ - static public function getCurrencies() + public static function getCurrencies() { return array_keys(self::getCurrenciesData(self::getDefault())); } @@ -200,7 +200,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function acceptFromHttp($header) + public static function acceptFromHttp($header) { throw new MethodNotImplementedException(__METHOD__); } @@ -216,7 +216,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function composeLocale(array $subtags) + public static function composeLocale(array $subtags) { throw new MethodNotImplementedException(__METHOD__); } @@ -234,7 +234,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function filterMatches($langtag, $locale, $canonicalize = false) + public static function filterMatches($langtag, $locale, $canonicalize = false) { throw new MethodNotImplementedException(__METHOD__); } @@ -250,7 +250,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getAllVariants($locale) + public static function getAllVariants($locale) { throw new MethodNotImplementedException(__METHOD__); } @@ -264,7 +264,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getDefault() + public static function getDefault() { return 'en'; } @@ -281,7 +281,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getDisplayLanguage($locale, $inLocale = null) + public static function getDisplayLanguage($locale, $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -298,7 +298,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getDisplayName($locale, $inLocale = null) + public static function getDisplayName($locale, $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -315,7 +315,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getDisplayRegion($locale, $inLocale = null) + public static function getDisplayRegion($locale, $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -332,7 +332,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getDisplayScript($locale, $inLocale = null) + public static function getDisplayScript($locale, $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -349,7 +349,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getDisplayVariant($locale, $inLocale = null) + public static function getDisplayVariant($locale, $inLocale = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -365,7 +365,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getKeywords($locale) + public static function getKeywords($locale) { throw new MethodNotImplementedException(__METHOD__); } @@ -381,7 +381,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getPrimaryLanguage($locale) + public static function getPrimaryLanguage($locale) { throw new MethodNotImplementedException(__METHOD__); } @@ -397,7 +397,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getRegion($locale) + public static function getRegion($locale) { throw new MethodNotImplementedException(__METHOD__); } @@ -413,7 +413,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function getScript($locale) + public static function getScript($locale) { throw new MethodNotImplementedException(__METHOD__); } @@ -430,7 +430,7 @@ class StubLocale * * @throws RuntimeException When the intl extension is not loaded */ - static public function lookup(array $langtag, $locale, $canonicalize = false, $default = null) + public static function lookup(array $langtag, $locale, $canonicalize = false, $default = null) { throw new MethodNotImplementedException(__METHOD__); } @@ -446,7 +446,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function parseLocale($locale) + public static function parseLocale($locale) { throw new MethodNotImplementedException(__METHOD__); } @@ -462,7 +462,7 @@ class StubLocale * * @throws MethodNotImplementedException */ - static public function setDefault($locale) + public static function setDefault($locale) { throw new MethodNotImplementedException(__METHOD__); } @@ -478,7 +478,7 @@ class StubLocale * * @throws InvalidArgumentException When the locale is different than 'en' */ - static private function getStubData($locale, $cacheVariable, $stubDataDir) + private static function getStubData($locale, $cacheVariable, $stubDataDir) { if ('en' !== $locale) { throw new \InvalidArgumentException(sprintf('Only the \'en\' locale is supported. %s', NotImplementedException::INTL_INSTALL_MESSAGE)); diff --git a/src/Symfony/Component/Locale/Stub/StubNumberFormatter.php b/src/Symfony/Component/Locale/Stub/StubNumberFormatter.php index 2524892a05..4cf860577c 100644 --- a/src/Symfony/Component/Locale/Stub/StubNumberFormatter.php +++ b/src/Symfony/Component/Locale/Stub/StubNumberFormatter.php @@ -158,7 +158,7 @@ class StubNumberFormatter * * @var array */ - static private $supportedStyles = array( + private static $supportedStyles = array( 'CURRENCY' => self::CURRENCY, 'DECIMAL' => self::DECIMAL ); @@ -168,7 +168,7 @@ class StubNumberFormatter * * @var array */ - static private $supportedAttributes = array( + private static $supportedAttributes = array( 'FRACTION_DIGITS' => self::FRACTION_DIGITS, 'GROUPING_USED' => self::GROUPING_USED, 'ROUNDING_MODE' => self::ROUNDING_MODE @@ -181,7 +181,7 @@ class StubNumberFormatter * * @var array */ - static private $roundingModes = array( + private static $roundingModes = array( 'ROUND_HALFEVEN' => self::ROUND_HALFEVEN, 'ROUND_HALFDOWN' => self::ROUND_HALFDOWN, 'ROUND_HALFUP' => self::ROUND_HALFUP @@ -195,7 +195,7 @@ class StubNumberFormatter * * @var array */ - static private $phpRoundingMap = array( + private static $phpRoundingMap = array( self::ROUND_HALFDOWN => \PHP_ROUND_HALF_DOWN, self::ROUND_HALFEVEN => \PHP_ROUND_HALF_EVEN, self::ROUND_HALFUP => \PHP_ROUND_HALF_UP @@ -206,7 +206,7 @@ class StubNumberFormatter * * @var array */ - static private $int32Range = array( + private static $int32Range = array( 'positive' => 2147483647, 'negative' => -2147483648 ); @@ -216,7 +216,7 @@ class StubNumberFormatter * * @var array */ - static private $int64Range = array( + private static $int64Range = array( 'positive' => 9223372036854775807, 'negative' => -9223372036854775808 ); @@ -274,7 +274,7 @@ class StubNumberFormatter * @throws MethodArgumentValueNotImplementedException When the $style is not supported * @throws MethodArgumentNotImplementedException When the pattern value is different than null */ - static public function create($locale = 'en', $style = null, $pattern = null) + public static function create($locale = 'en', $style = null, $pattern = null) { return new self($locale, $style, $pattern); } diff --git a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php index 89a4ef3437..6f5353caf2 100644 --- a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php +++ b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php @@ -34,12 +34,12 @@ interface GeneratorDumperInterface * * @return string A PHP class representing the generator class */ - function dump(array $options = array()); + public function dump(array $options = array()); /** * Gets the routes to dump. * * @return RouteCollection A RouteCollection instance */ - function getRoutes(); + public function getRoutes(); } diff --git a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php index d1d8d00332..6f2800c27c 100644 --- a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php +++ b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php @@ -33,5 +33,5 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface * * @api */ - function generate($name, $parameters = array(), $absolute = false); + public function generate($name, $parameters = array(), $absolute = false); } diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php index 881e24966c..9be13673d5 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Routing\Matcher\Dumper; - /** * Dumps a set of Apache mod_rewrite rules. * @@ -131,7 +130,7 @@ class ApacheMatcherDumper extends MatcherDumper * * @return string The escaped string */ - static private function escape($string, $char, $with) + private static function escape($string, $char, $with) { $escaped = false; $output = ''; diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php index 6822f0821f..fe09e067d7 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php @@ -30,12 +30,12 @@ interface MatcherDumperInterface * * @return string A PHP class representing the matcher class */ - function dump(array $options = array()); + public function dump(array $options = array()); /** * Gets the routes to match. * * @return RouteCollection A RouteCollection instance */ - function getRoutes(); + public function getRoutes(); } diff --git a/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php b/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php index 7225c81cd5..929ae9cc78 100644 --- a/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php +++ b/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php @@ -31,5 +31,5 @@ interface RedirectableUrlMatcherInterface * * @api */ - function redirect($path, $route, $scheme = null); + public function redirect($path, $route, $scheme = null); } diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php b/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php index e9860908d2..5823d3201b 100644 --- a/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php +++ b/src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php @@ -34,5 +34,5 @@ interface UrlMatcherInterface extends RequestContextAwareInterface * * @api */ - function match($pathinfo); + public function match($pathinfo); } diff --git a/src/Symfony/Component/Routing/RequestContextAwareInterface.php b/src/Symfony/Component/Routing/RequestContextAwareInterface.php index 9d3a28fdb4..38443a88b7 100644 --- a/src/Symfony/Component/Routing/RequestContextAwareInterface.php +++ b/src/Symfony/Component/Routing/RequestContextAwareInterface.php @@ -23,5 +23,5 @@ interface RequestContextAwareInterface * * @api */ - function setContext(RequestContext $context); + public function setContext(RequestContext $context); } diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index 68d71d1728..548568334d 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -26,7 +26,7 @@ class Route private $options; private $compiled; - static private $compilers = array(); + private static $compilers = array(); /** * Constructor. diff --git a/src/Symfony/Component/Routing/RouteCompilerInterface.php b/src/Symfony/Component/Routing/RouteCompilerInterface.php index e0ad86b311..5c988adafb 100644 --- a/src/Symfony/Component/Routing/RouteCompilerInterface.php +++ b/src/Symfony/Component/Routing/RouteCompilerInterface.php @@ -25,5 +25,5 @@ interface RouteCompilerInterface * * @return CompiledRoute A CompiledRoute instance */ - function compile(Route $route); + public function compile(Route $route); } diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php index 75093d9157..b14b6bf024 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php @@ -339,7 +339,7 @@ QUERY; * @param ObjectIdentityInterface $oid * @return integer */ - protected final function retrieveObjectIdentityPrimaryKey(ObjectIdentityInterface $oid) + final protected function retrieveObjectIdentityPrimaryKey(ObjectIdentityInterface $oid) { return $this->connection->executeQuery($this->getSelectObjectIdentityIdSql($oid))->fetchColumn(); } diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php index c77dab1e03..32b0faff26 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Acl.php +++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php @@ -19,7 +19,6 @@ use Symfony\Component\Security\Acl\Model\ObjectIdentityInterface; use Symfony\Component\Security\Acl\Model\PermissionGrantingStrategyInterface; use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface; - /** * An ACL implementation. * diff --git a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php index 42fc67cc41..927a1b8ec8 100644 --- a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php +++ b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php @@ -52,7 +52,7 @@ final class ObjectIdentity implements ObjectIdentityInterface * @throws \InvalidArgumentException * @return ObjectIdentity */ - static public function fromDomainObject($domainObject) + public static function fromDomainObject($domainObject) { if (!is_object($domainObject)) { throw new InvalidDomainObjectException('$domainObject must be an object.'); diff --git a/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php b/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php index e9ff0a226d..34051e8c7f 100644 --- a/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php +++ b/src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php @@ -50,7 +50,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface * @param UserInterface $user * @return UserSecurityIdentity */ - static public function fromAccount(UserInterface $user) + public static function fromAccount(UserInterface $user) { return new self($user->getUsername(), get_class($user)); } @@ -61,7 +61,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface * @param TokenInterface $token * @return UserSecurityIdentity */ - static public function fromToken(TokenInterface $token) + public static function fromToken(TokenInterface $token) { $user = $token->getUser(); diff --git a/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php b/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php index bc6c11fc3a..c353822bd8 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php @@ -24,7 +24,7 @@ interface AclCacheInterface * @param string $primaryKey a serialized primary key * @return void */ - function evictFromCacheById($primaryKey); + public function evictFromCacheById($primaryKey); /** * Removes an ACL from the cache @@ -34,7 +34,7 @@ interface AclCacheInterface * @param ObjectIdentityInterface $oid * @return void */ - function evictFromCacheByIdentity(ObjectIdentityInterface $oid); + public function evictFromCacheByIdentity(ObjectIdentityInterface $oid); /** * Retrieves an ACL for the given object identity primary key from the cache @@ -42,7 +42,7 @@ interface AclCacheInterface * @param integer $primaryKey * @return AclInterface */ - function getFromCacheById($primaryKey); + public function getFromCacheById($primaryKey); /** * Retrieves an ACL for the given object identity from the cache @@ -50,7 +50,7 @@ interface AclCacheInterface * @param ObjectIdentityInterface $oid * @return AclInterface */ - function getFromCacheByIdentity(ObjectIdentityInterface $oid); + public function getFromCacheByIdentity(ObjectIdentityInterface $oid); /** * Stores a new ACL in the cache @@ -58,12 +58,12 @@ interface AclCacheInterface * @param AclInterface $acl * @return void */ - function putInCache(AclInterface $acl); + public function putInCache(AclInterface $acl); /** * Removes all ACLs from the cache * * @return void */ - function clearCache(); + public function clearCache(); } diff --git a/src/Symfony/Component/Security/Acl/Model/AclInterface.php b/src/Symfony/Component/Security/Acl/Model/AclInterface.php index 90945607a7..fffe59166f 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclInterface.php @@ -28,7 +28,7 @@ interface AclInterface extends \Serializable * * @return array */ - function getClassAces(); + public function getClassAces(); /** * Returns all class-field-based ACEs associated with this ACL @@ -36,14 +36,14 @@ interface AclInterface extends \Serializable * @param string $field * @return array */ - function getClassFieldAces($field); + public function getClassFieldAces($field); /** * Returns all object-based ACEs associated with this ACL * * @return array */ - function getObjectAces(); + public function getObjectAces(); /** * Returns all object-field-based ACEs associated with this ACL @@ -51,28 +51,28 @@ interface AclInterface extends \Serializable * @param string $field * @return array */ - function getObjectFieldAces($field); + public function getObjectFieldAces($field); /** * Returns the object identity associated with this ACL * * @return ObjectIdentityInterface */ - function getObjectIdentity(); + public function getObjectIdentity(); /** * Returns the parent ACL, or null if there is none. * * @return AclInterface|null */ - function getParentAcl(); + public function getParentAcl(); /** * Whether this ACL is inheriting ACEs from a parent ACL. * * @return Boolean */ - function isEntriesInheriting(); + public function isEntriesInheriting(); /** * Determines whether field access is granted @@ -83,7 +83,7 @@ interface AclInterface extends \Serializable * @param Boolean $administrativeMode * @return Boolean */ - function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false); + public function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false); /** * Determines whether access is granted @@ -94,7 +94,7 @@ interface AclInterface extends \Serializable * @param Boolean $administrativeMode * @return Boolean */ - function isGranted(array $masks, array $securityIdentities, $administrativeMode = false); + public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false); /** * Whether the ACL has loaded ACEs for all of the passed security identities @@ -102,5 +102,5 @@ interface AclInterface extends \Serializable * @param mixed $securityIdentities an implementation of SecurityIdentityInterface, or an array thereof * @return Boolean */ - function isSidLoaded($securityIdentities); + public function isSidLoaded($securityIdentities); } diff --git a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php index 2f878e1a92..bdb40b7797 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php @@ -25,7 +25,7 @@ interface AclProviderInterface * @param Boolean $directChildrenOnly * @return array returns an array of child 'ObjectIdentity's */ - function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly = false); + public function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly = false); /** * Returns the ACL that belongs to the given object identity @@ -35,7 +35,7 @@ interface AclProviderInterface * @param array $sids * @return AclInterface */ - function findAcl(ObjectIdentityInterface $oid, array $sids = array()); + public function findAcl(ObjectIdentityInterface $oid, array $sids = array()); /** * Returns the ACLs that belong to the given object identities @@ -45,5 +45,5 @@ interface AclProviderInterface * @param array $sids an array of SecurityIdentityInterface implementations * @return \SplObjectStorage mapping the passed object identities to ACLs */ - function findAcls(array $oids, array $sids = array()); + public function findAcls(array $oids, array $sids = array()); } diff --git a/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php index f4a83b38c8..511989a030 100644 --- a/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php @@ -26,5 +26,5 @@ interface AuditLoggerInterface * @param EntryInterface $ace * @return void */ - function logIfNeeded($granted, EntryInterface $ace); + public function logIfNeeded($granted, EntryInterface $ace); } diff --git a/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php index 8f473ff923..b231da5ea0 100644 --- a/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php @@ -26,7 +26,7 @@ interface AuditableAclInterface extends MutableAclInterface * @param Boolean $auditFailure * @return void */ - function updateClassAuditing($index, $auditSuccess, $auditFailure); + public function updateClassAuditing($index, $auditSuccess, $auditFailure); /** * Updates auditing for class-field-based ACE @@ -38,7 +38,7 @@ interface AuditableAclInterface extends MutableAclInterface * @return void */ - function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure); + public function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure); /** * Updates auditing for object-based ACE @@ -48,7 +48,7 @@ interface AuditableAclInterface extends MutableAclInterface * @param Boolean $auditFailure * @return void */ - function updateObjectAuditing($index, $auditSuccess, $auditFailure); + public function updateObjectAuditing($index, $auditSuccess, $auditFailure); /** * Updates auditing for object-field-based ACE @@ -59,5 +59,5 @@ interface AuditableAclInterface extends MutableAclInterface * @param Boolean $auditFailure * @return void */ - function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure); + public function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure); } diff --git a/src/Symfony/Component/Security/Acl/Model/AuditableEntryInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditableEntryInterface.php index 40c4484f9b..e957965c48 100644 --- a/src/Symfony/Component/Security/Acl/Model/AuditableEntryInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/AuditableEntryInterface.php @@ -23,12 +23,12 @@ interface AuditableEntryInterface extends EntryInterface * * @return Boolean */ - function isAuditFailure(); + public function isAuditFailure(); /** * Whether auditing for successful denies is turned on * * @return Boolean */ - function isAuditSuccess(); + public function isAuditSuccess(); } diff --git a/src/Symfony/Component/Security/Acl/Model/DomainObjectInterface.php b/src/Symfony/Component/Security/Acl/Model/DomainObjectInterface.php index 50bc4c34d6..195cb4ec64 100644 --- a/src/Symfony/Component/Security/Acl/Model/DomainObjectInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/DomainObjectInterface.php @@ -25,5 +25,5 @@ interface DomainObjectInterface * * @return string */ - function getObjectIdentifier(); + public function getObjectIdentifier(); } diff --git a/src/Symfony/Component/Security/Acl/Model/EntryInterface.php b/src/Symfony/Component/Security/Acl/Model/EntryInterface.php index 6fe0dc8a11..98b754c111 100644 --- a/src/Symfony/Component/Security/Acl/Model/EntryInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/EntryInterface.php @@ -26,40 +26,40 @@ interface EntryInterface extends \Serializable * * @return AclInterface */ - function getAcl(); + public function getAcl(); /** * The primary key of this ACE * * @return integer */ - function getId(); + public function getId(); /** * The permission mask of this ACE * * @return integer */ - function getMask(); + public function getMask(); /** * The security identity associated with this ACE * * @return SecurityIdentityInterface */ - function getSecurityIdentity(); + public function getSecurityIdentity(); /** * The strategy for comparing masks * * @return string */ - function getStrategy(); + public function getStrategy(); /** * Returns whether this ACE is granting, or denying * * @return Boolean */ - function isGranting(); + public function isGranting(); } diff --git a/src/Symfony/Component/Security/Acl/Model/FieldEntryInterface.php b/src/Symfony/Component/Security/Acl/Model/FieldEntryInterface.php index a35ddb4cb5..8382ae1b53 100644 --- a/src/Symfony/Component/Security/Acl/Model/FieldEntryInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/FieldEntryInterface.php @@ -23,5 +23,5 @@ interface FieldEntryInterface extends EntryInterface * * @return string */ - function getField(); + public function getField(); } diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php index b83c10641f..11835dbc0c 100644 --- a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php @@ -27,7 +27,7 @@ interface MutableAclInterface extends AclInterface * @param integer $index * @return void */ - function deleteClassAce($index); + public function deleteClassAce($index); /** * Deletes a class-field-based ACE @@ -36,7 +36,7 @@ interface MutableAclInterface extends AclInterface * @param string $field * @return void */ - function deleteClassFieldAce($index, $field); + public function deleteClassFieldAce($index, $field); /** * Deletes an object-based ACE @@ -44,7 +44,7 @@ interface MutableAclInterface extends AclInterface * @param integer $index * @return void */ - function deleteObjectAce($index); + public function deleteObjectAce($index); /** * Deletes an object-field-based ACE @@ -53,14 +53,14 @@ interface MutableAclInterface extends AclInterface * @param string $field * @return void */ - function deleteObjectFieldAce($index, $field); + public function deleteObjectFieldAce($index, $field); /** * Returns the primary key of this ACL * * @return integer */ - function getId(); + public function getId(); /** * Inserts a class-based ACE @@ -72,7 +72,7 @@ interface MutableAclInterface extends AclInterface * @param string $strategy * @return void */ - function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); + public function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); /** * Inserts a class-field-based ACE @@ -85,7 +85,7 @@ interface MutableAclInterface extends AclInterface * @param string $strategy * @return void */ - function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); + public function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); /** * Inserts an object-based ACE @@ -97,7 +97,7 @@ interface MutableAclInterface extends AclInterface * @param string $strategy * @return void */ - function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); + public function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); /** * Inserts an object-field-based ACE @@ -110,7 +110,7 @@ interface MutableAclInterface extends AclInterface * @param string $strategy * @return void */ - function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); + public function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); /** * Sets whether entries are inherited @@ -118,7 +118,7 @@ interface MutableAclInterface extends AclInterface * @param Boolean $boolean * @return void */ - function setEntriesInheriting($boolean); + public function setEntriesInheriting($boolean); /** * Sets the parent ACL @@ -126,7 +126,7 @@ interface MutableAclInterface extends AclInterface * @param AclInterface $acl * @return void */ - function setParentAcl(AclInterface $acl); + public function setParentAcl(AclInterface $acl); /** * Updates a class-based ACE @@ -136,7 +136,7 @@ interface MutableAclInterface extends AclInterface * @param string $strategy if null the strategy should not be changed * @return void */ - function updateClassAce($index, $mask, $strategy = null); + public function updateClassAce($index, $mask, $strategy = null); /** * Updates a class-field-based ACE @@ -147,7 +147,7 @@ interface MutableAclInterface extends AclInterface * @param string $strategy if null the strategy should not be changed * @return void */ - function updateClassFieldAce($index, $field, $mask, $strategy = null); + public function updateClassFieldAce($index, $field, $mask, $strategy = null); /** * Updates an object-based ACE @@ -157,7 +157,7 @@ interface MutableAclInterface extends AclInterface * @param string $strategy if null the strategy should not be changed * @return void */ - function updateObjectAce($index, $mask, $strategy = null); + public function updateObjectAce($index, $mask, $strategy = null); /** * Updates an object-field-based ACE @@ -168,5 +168,5 @@ interface MutableAclInterface extends AclInterface * @param string $strategy if null the strategy should not be changed * @return void */ - function updateObjectFieldAce($index, $field, $mask, $strategy = null); + public function updateObjectFieldAce($index, $field, $mask, $strategy = null); } diff --git a/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php index 4671816f2c..94d9bcc6e4 100644 --- a/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php @@ -26,7 +26,7 @@ interface MutableAclProviderInterface extends AclProviderInterface * @param ObjectIdentityInterface $oid * @return MutableAclInterface */ - function createAcl(ObjectIdentityInterface $oid); + public function createAcl(ObjectIdentityInterface $oid); /** * Deletes the ACL for a given object identity. @@ -37,7 +37,7 @@ interface MutableAclProviderInterface extends AclProviderInterface * @param ObjectIdentityInterface $oid * @return void */ - function deleteAcl(ObjectIdentityInterface $oid); + public function deleteAcl(ObjectIdentityInterface $oid); /** * Persists any changes which were made to the ACL, or any associated @@ -48,5 +48,5 @@ interface MutableAclProviderInterface extends AclProviderInterface * @param MutableAclInterface $acl * @return void */ - function updateAcl(MutableAclInterface $acl); + public function updateAcl(MutableAclInterface $acl); } diff --git a/src/Symfony/Component/Security/Acl/Model/ObjectIdentityInterface.php b/src/Symfony/Component/Security/Acl/Model/ObjectIdentityInterface.php index 7e892bfd88..8ad0ebae61 100644 --- a/src/Symfony/Component/Security/Acl/Model/ObjectIdentityInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/ObjectIdentityInterface.php @@ -30,7 +30,7 @@ interface ObjectIdentityInterface * @param ObjectIdentityInterface $identity * @return Boolean */ - function equals(ObjectIdentityInterface $identity); + public function equals(ObjectIdentityInterface $identity); /** * Obtains a unique identifier for this object. The identifier must not be @@ -38,12 +38,12 @@ interface ObjectIdentityInterface * * @return string cannot return null */ - function getIdentifier(); + public function getIdentifier(); /** * Returns a type for the domain object. Typically, this is the PHP class name. * * @return string cannot return null */ - function getType(); + public function getType(); } diff --git a/src/Symfony/Component/Security/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php b/src/Symfony/Component/Security/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php index e53c3da1ea..b0f7f78528 100644 --- a/src/Symfony/Component/Security/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php @@ -24,5 +24,5 @@ interface ObjectIdentityRetrievalStrategyInterface * @param object $domainObject * @return ObjectIdentityInterface */ - function getObjectIdentity($domainObject); + public function getObjectIdentity($domainObject); } diff --git a/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php b/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php index 7afdfac7ed..7f8f81bb28 100644 --- a/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php @@ -27,7 +27,7 @@ interface PermissionGrantingStrategyInterface * @param Boolean $administrativeMode * @return Boolean */ - function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false); + public function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false); /** * Determines whether access to a domain object's field is to be granted @@ -40,5 +40,5 @@ interface PermissionGrantingStrategyInterface * * @return Boolean */ - function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false); + public function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false); } diff --git a/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php b/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php index 1833630707..185b119eb5 100644 --- a/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php @@ -27,5 +27,5 @@ interface SecurityIdentityInterface * @param SecurityIdentityInterface $identity * @return void */ - function equals(SecurityIdentityInterface $identity); + public function equals(SecurityIdentityInterface $identity); } diff --git a/src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php b/src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php index 3bbbaa4a47..c20f04bfb7 100644 --- a/src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php +++ b/src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php @@ -30,5 +30,5 @@ interface SecurityIdentityRetrievalStrategyInterface * @param TokenInterface $token * @return array of SecurityIdentityInterface implementations */ - function getSecurityIdentities(TokenInterface $token); + public function getSecurityIdentities(TokenInterface $token); } diff --git a/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php b/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php index b17233fc4d..908de9572a 100644 --- a/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php +++ b/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php @@ -176,7 +176,7 @@ class MaskBuilder * @throws \RuntimeException * @return string */ - static public function getCode($mask) + public static function getCode($mask) { if (!is_int($mask)) { throw new \InvalidArgumentException('$mask must be an integer.'); diff --git a/src/Symfony/Component/Security/Acl/Permission/PermissionMapInterface.php b/src/Symfony/Component/Security/Acl/Permission/PermissionMapInterface.php index c2e49d5a58..44c15cc945 100644 --- a/src/Symfony/Component/Security/Acl/Permission/PermissionMapInterface.php +++ b/src/Symfony/Component/Security/Acl/Permission/PermissionMapInterface.php @@ -28,7 +28,7 @@ interface PermissionMapInterface * @param object $object * @return array may return null if permission/object combination is not supported */ - function getMasks($permission, $object); + public function getMasks($permission, $object); /** * Whether this map contains the given permission @@ -36,5 +36,5 @@ interface PermissionMapInterface * @param string $permission * @return Boolean */ - function contains($permission); + public function contains($permission); } diff --git a/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php b/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php index 86633f9ecd..df3b76186b 100644 --- a/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php +++ b/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php @@ -25,7 +25,6 @@ $loader->registerNamespaces(array( )); $loader->register(); - $schema = new Schema(array( 'class_table_name' => 'acl_classes', 'entry_table_name' => 'acl_entries', diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationManagerInterface.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationManagerInterface.php index 36cdc92e74..d8f4716002 100644 --- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationManagerInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationManagerInterface.php @@ -31,5 +31,5 @@ interface AuthenticationManagerInterface * * @throws AuthenticationException if the authentication fails */ - function authenticate(TokenInterface $token); + public function authenticate(TokenInterface $token); } diff --git a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php index adcef3cd4e..ac07db0afa 100644 --- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolverInterface.php @@ -30,7 +30,7 @@ interface AuthenticationTrustResolverInterface * * @return Boolean */ - function isAnonymous(TokenInterface $token = null); + public function isAnonymous(TokenInterface $token = null); /** * Resolves whether the passed token implementation is authenticated @@ -40,7 +40,7 @@ interface AuthenticationTrustResolverInterface * * @return Boolean */ - function isRememberMe(TokenInterface $token = null); + public function isRememberMe(TokenInterface $token = null); /** * Resolves whether the passed token implementation is fully authenticated. @@ -49,5 +49,5 @@ interface AuthenticationTrustResolverInterface * * @return Boolean */ - function isFullFledged(TokenInterface $token = null); + public function isFullFledged(TokenInterface $token = null); } diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentTokenInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentTokenInterface.php index 004a9b7835..327ffe2ce7 100644 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentTokenInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/PersistentTokenInterface.php @@ -23,29 +23,29 @@ interface PersistentTokenInterface * Returns the class of the user * @return string */ - function getClass(); + public function getClass(); /** * Returns the username * @return string */ - function getUsername(); + public function getUsername(); /** * Returns the series * @return string */ - function getSeries(); + public function getSeries(); /** * Returns the token value * @return string */ - function getTokenValue(); + public function getTokenValue(); /** * Returns the last time the cookie was used * @return \DateTime */ - function getLastUsed(); + public function getLastUsed(); } diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php index 7f86e4e38f..7ef60acf9d 100644 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php @@ -27,14 +27,14 @@ interface TokenProviderInterface * * @return PersistentTokenInterface */ - function loadTokenBySeries($series); + public function loadTokenBySeries($series); /** * Deletes all tokens belonging to series. * * @param string $series */ - function deleteTokenBySeries($series); + public function deleteTokenBySeries($series); /** * Updates the token according to this data. @@ -43,12 +43,12 @@ interface TokenProviderInterface * @param string $tokenValue * @param DateTime $lastUsed */ - function updateToken($series, $tokenValue, \DateTime $lastUsed); + public function updateToken($series, $tokenValue, \DateTime $lastUsed); /** * Creates a new token. * * @param PersistentTokenInterface $token */ - function createNewToken(PersistentTokenInterface $token); + public function createNewToken(PersistentTokenInterface $token); } diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php index 3dafccc2de..dec31d5a63 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/TokenInterface.php @@ -26,21 +26,21 @@ interface TokenInterface extends \Serializable * * @return string */ - function __toString(); + public function __toString(); /** * Returns the user roles. * * @return Role[] An array of Role instances. */ - function getRoles(); + public function getRoles(); /** * Returns the user credentials. * * @return mixed The user credentials */ - function getCredentials(); + public function getCredentials(); /** * Returns a user representation. @@ -48,54 +48,54 @@ interface TokenInterface extends \Serializable * @return mixed either returns an object which implements __toString(), or * a primitive string is returned. */ - function getUser(); + public function getUser(); /** * Sets a user. * * @param mixed $user */ - function setUser($user); + public function setUser($user); /** * Returns the username. * * @return string */ - function getUsername(); + public function getUsername(); /** * Returns whether the user is authenticated or not. * * @return Boolean true if the token has been authenticated, false otherwise */ - function isAuthenticated(); + public function isAuthenticated(); /** * Sets the authenticated flag. * * @param Boolean $isAuthenticated The authenticated flag */ - function setAuthenticated($isAuthenticated); + public function setAuthenticated($isAuthenticated); /** * Removes sensitive information from the token. */ - function eraseCredentials(); + public function eraseCredentials(); /** * Returns the token attributes. * * @return array The token attributes */ - function getAttributes(); + public function getAttributes(); /** * Sets the token attributes. * * @param array $attributes The token attributes */ - function setAttributes(array $attributes); + public function setAttributes(array $attributes); /** * Returns true if the attribute exists. @@ -104,7 +104,7 @@ interface TokenInterface extends \Serializable * * @return Boolean true if the attribute exists, false otherwise */ - function hasAttribute($name); + public function hasAttribute($name); /** * Returns an attribute value. @@ -115,7 +115,7 @@ interface TokenInterface extends \Serializable * * @throws \InvalidArgumentException When attribute doesn't exist for this token */ - function getAttribute($name); + public function getAttribute($name); /** * Sets an attribute. @@ -123,5 +123,5 @@ interface TokenInterface extends \Serializable * @param string $name The attribute name * @param mixed $value The attribute value */ - function setAttribute($name, $value); + public function setAttribute($name, $value); } diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManagerInterface.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManagerInterface.php index 648047ab14..742ea74fb6 100644 --- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManagerInterface.php +++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManagerInterface.php @@ -29,7 +29,7 @@ interface AccessDecisionManagerInterface * * @return Boolean true if the access is granted, false otherwise */ - function decide(TokenInterface $token, array $attributes, $object = null); + public function decide(TokenInterface $token, array $attributes, $object = null); /** * Checks if the access decision manager supports the given attribute. @@ -38,7 +38,7 @@ interface AccessDecisionManagerInterface * * @return Boolean true if this decision manager supports the attribute, false otherwise */ - function supportsAttribute($attribute); + public function supportsAttribute($attribute); /** * Checks if the access decision manager supports the given class. @@ -47,5 +47,5 @@ interface AccessDecisionManagerInterface * * @return true if this decision manager can process the class */ - function supportsClass($class); + public function supportsClass($class); } diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php b/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php index 41d9e6475a..1fc93e50cc 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/VoterInterface.php @@ -31,7 +31,7 @@ interface VoterInterface * * @return Boolean true if this Voter supports the attribute, false otherwise */ - function supportsAttribute($attribute); + public function supportsAttribute($attribute); /** * Checks if the voter supports the given class. @@ -40,7 +40,7 @@ interface VoterInterface * * @return true if this Voter can process the class */ - function supportsClass($class); + public function supportsClass($class); /** * Returns the vote for the given parameters. @@ -54,5 +54,5 @@ interface VoterInterface * * @return integer either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED */ - function vote(TokenInterface $token, $object, array $attributes); + public function vote(TokenInterface $token, $object, array $attributes); } diff --git a/src/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php b/src/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php index 3ae07e65a5..978f9070ea 100644 --- a/src/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php +++ b/src/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php @@ -27,5 +27,5 @@ interface EncoderFactoryInterface * * @return PasswordEncoderInterface never null */ - function getEncoder(UserInterface $user); + public function getEncoder(UserInterface $user); } diff --git a/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php b/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php index dae6c69a7d..78b4e42a87 100644 --- a/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php +++ b/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php @@ -26,7 +26,7 @@ interface PasswordEncoderInterface * * @return string The encoded password */ - function encodePassword($raw, $salt); + public function encodePassword($raw, $salt); /** * Checks a raw password against an encoded password. @@ -37,5 +37,5 @@ interface PasswordEncoderInterface * * @return Boolean true if the password is valid, false otherwise */ - function isPasswordValid($encoded, $raw, $salt); + public function isPasswordValid($encoded, $raw, $salt); } diff --git a/src/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php b/src/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php index d873b80302..c495a7f14d 100644 --- a/src/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php +++ b/src/Symfony/Component/Security/Core/Role/RoleHierarchyInterface.php @@ -28,5 +28,5 @@ interface RoleHierarchyInterface * * @return array An array of all reachable roles */ - function getReachableRoles(array $roles); + public function getReachableRoles(array $roles); } diff --git a/src/Symfony/Component/Security/Core/Role/RoleInterface.php b/src/Symfony/Component/Security/Core/Role/RoleInterface.php index debda3a3e4..a3cb26635f 100644 --- a/src/Symfony/Component/Security/Core/Role/RoleInterface.php +++ b/src/Symfony/Component/Security/Core/Role/RoleInterface.php @@ -31,5 +31,5 @@ interface RoleInterface * * @return string|null A string representation of the role, or null */ - function getRole(); + public function getRole(); } diff --git a/src/Symfony/Component/Security/Core/SecurityContext.php b/src/Symfony/Component/Security/Core/SecurityContext.php index bc6493b01d..1ec43e68ae 100644 --- a/src/Symfony/Component/Security/Core/SecurityContext.php +++ b/src/Symfony/Component/Security/Core/SecurityContext.php @@ -55,7 +55,7 @@ class SecurityContext implements SecurityContextInterface * * @return Boolean */ - public final function isGranted($attributes, $object = null) + final public function isGranted($attributes, $object = null) { if (null === $this->token) { throw new AuthenticationCredentialsNotFoundException('The security context contains no authentication token. One possible reason may be that there is no firewall configured for this URL.'); diff --git a/src/Symfony/Component/Security/Core/SecurityContextInterface.php b/src/Symfony/Component/Security/Core/SecurityContextInterface.php index 46b2cc4761..8fdd453fe3 100644 --- a/src/Symfony/Component/Security/Core/SecurityContextInterface.php +++ b/src/Symfony/Component/Security/Core/SecurityContextInterface.php @@ -29,7 +29,7 @@ interface SecurityContextInterface * * @return TokenInterface|null A TokenInterface instance or null if no authentication information is available */ - function getToken(); + public function getToken(); /** * Sets the authentication token. @@ -38,7 +38,7 @@ interface SecurityContextInterface * * @return void */ - function setToken(TokenInterface $token = null); + public function setToken(TokenInterface $token = null); /** * Checks if the attributes are granted against the current authentication token and optionally supplied object. @@ -48,5 +48,5 @@ interface SecurityContextInterface * * @return Boolean */ - function isGranted($attributes, $object = null); + public function isGranted($attributes, $object = null); } diff --git a/src/Symfony/Component/Security/Core/User/AdvancedUserInterface.php b/src/Symfony/Component/Security/Core/User/AdvancedUserInterface.php index e951c65eb0..5b3a51a191 100644 --- a/src/Symfony/Component/Security/Core/User/AdvancedUserInterface.php +++ b/src/Symfony/Component/Security/Core/User/AdvancedUserInterface.php @@ -47,7 +47,7 @@ interface AdvancedUserInterface extends UserInterface * * @see AccountExpiredException */ - function isAccountNonExpired(); + public function isAccountNonExpired(); /** * Checks whether the user is locked. @@ -59,7 +59,7 @@ interface AdvancedUserInterface extends UserInterface * * @see LockedException */ - function isAccountNonLocked(); + public function isAccountNonLocked(); /** * Checks whether the user's credentials (password) has expired. @@ -71,7 +71,7 @@ interface AdvancedUserInterface extends UserInterface * * @see CredentialsExpiredException */ - function isCredentialsNonExpired(); + public function isCredentialsNonExpired(); /** * Checks whether the user is enabled. @@ -83,5 +83,5 @@ interface AdvancedUserInterface extends UserInterface * * @see DisabledException */ - function isEnabled(); + public function isEnabled(); } diff --git a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php b/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php index 61f0f6eaa1..3dd8d51bf5 100644 --- a/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserCheckerInterface.php @@ -25,12 +25,12 @@ interface UserCheckerInterface * * @param UserInterface $user a UserInterface instance */ - function checkPreAuth(UserInterface $user); + public function checkPreAuth(UserInterface $user); /** * Checks the user account after authentication. * * @param UserInterface $user a UserInterface instance */ - function checkPostAuth(UserInterface $user); + public function checkPostAuth(UserInterface $user); } diff --git a/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php index 85356b77a0..ccb6fbdcb4 100644 --- a/src/Symfony/Component/Security/Core/User/UserInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserInterface.php @@ -47,7 +47,7 @@ interface UserInterface * * @return Role[] The user roles */ - function getRoles(); + public function getRoles(); /** * Returns the password used to authenticate the user. @@ -57,7 +57,7 @@ interface UserInterface * * @return string The password */ - function getPassword(); + public function getPassword(); /** * Returns the salt that was originally used to encode the password. @@ -66,14 +66,14 @@ interface UserInterface * * @return string The salt */ - function getSalt(); + public function getSalt(); /** * Returns the username used to authenticate the user. * * @return string The username */ - function getUsername(); + public function getUsername(); /** * Removes sensitive data from the user. @@ -83,7 +83,7 @@ interface UserInterface * * @return void */ - function eraseCredentials(); + public function eraseCredentials(); /** * Returns whether or not the given user is equivalent to *this* user. @@ -98,5 +98,5 @@ interface UserInterface * * @return Boolean */ - function equals(UserInterface $user); + public function equals(UserInterface $user); } diff --git a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php b/src/Symfony/Component/Security/Core/User/UserProviderInterface.php index dbd7924a96..6669c437af 100644 --- a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserProviderInterface.php @@ -48,7 +48,7 @@ interface UserProviderInterface * @throws UsernameNotFoundException if the user is not found * */ - function loadUserByUsername($username); + public function loadUserByUsername($username); /** * Refreshes the user for the account interface. @@ -63,7 +63,7 @@ interface UserProviderInterface * * @throws UnsupportedUserException if the account is not supported */ - function refreshUser(UserInterface $user); + public function refreshUser(UserInterface $user); /** * Whether this provider supports the given user class @@ -72,5 +72,5 @@ interface UserProviderInterface * * @return Boolean */ - function supportsClass($class); + public function supportsClass($class); } diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php index d5d0067282..69b5426f7e 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php @@ -35,5 +35,5 @@ interface AuthenticationFailureHandlerInterface * * @return Response the response to return */ - function onAuthenticationFailure(Request $request, AuthenticationException $exception); + public function onAuthenticationFailure(Request $request, AuthenticationException $exception); } diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php index 3d7c5610ae..ed44ee508e 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php @@ -35,5 +35,5 @@ interface AuthenticationSuccessHandlerInterface * * @return Response the response to return */ - function onAuthenticationSuccess(Request $request, TokenInterface $token); + public function onAuthenticationSuccess(Request $request, TokenInterface $token); } diff --git a/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php b/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php index 2409c50e47..3811bf0ff9 100644 --- a/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Authorization/AccessDeniedHandlerInterface.php @@ -30,5 +30,5 @@ interface AccessDeniedHandlerInterface * * @return Response may return null */ - function handle(Request $request, AccessDeniedException $accessDeniedException); + public function handle(Request $request, AccessDeniedException $accessDeniedException); } diff --git a/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php b/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php index 9fc3501952..d190fc7b88 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/AuthenticationEntryPointInterface.php @@ -30,5 +30,5 @@ interface AuthenticationEntryPointInterface * * @return Response */ - function start(Request $request, AuthenticationException $authException = null); + public function start(Request $request, AuthenticationException $authException = null); } diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php index 9452e29240..8403ec7a3a 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php @@ -119,7 +119,7 @@ abstract class AbstractAuthenticationListener implements ListenerInterface * * @param GetResponseEvent $event A GetResponseEvent instance */ - public final function handle(GetResponseEvent $event) + final public function handle(GetResponseEvent $event) { $request = $event->getRequest(); diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php index 66d0ea1745..66041be7b6 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -51,7 +51,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface * * @param GetResponseEvent $event A GetResponseEvent instance */ - public final function handle(GetResponseEvent $event) + final public function handle(GetResponseEvent $event) { $request = $event->getRequest(); diff --git a/src/Symfony/Component/Security/Http/Firewall/ListenerInterface.php b/src/Symfony/Component/Security/Http/Firewall/ListenerInterface.php index ccde86e6d6..b67047405b 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ListenerInterface.php +++ b/src/Symfony/Component/Security/Http/Firewall/ListenerInterface.php @@ -25,5 +25,5 @@ interface ListenerInterface * * @param GetResponseEvent $event */ - function handle(GetResponseEvent $event); + public function handle(GetResponseEvent $event); } diff --git a/src/Symfony/Component/Security/Http/FirewallMapInterface.php b/src/Symfony/Component/Security/Http/FirewallMapInterface.php index 0630a869bf..57afc75dcb 100644 --- a/src/Symfony/Component/Security/Http/FirewallMapInterface.php +++ b/src/Symfony/Component/Security/Http/FirewallMapInterface.php @@ -34,5 +34,5 @@ interface FirewallMapInterface * * @return array of the format array(array(AuthenticationListener), ExceptionListener) */ - function getListeners(Request $request); + public function getListeners(Request $request); } diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php b/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php index 079cc003b8..6780e4df10 100644 --- a/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php @@ -33,5 +33,5 @@ interface LogoutHandlerInterface * * @return void */ - function logout(Request $request, Response $response, TokenInterface $token); + public function logout(Request $request, Response $response, TokenInterface $token); } diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php b/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php index 5c6c2b6577..ad878e6274 100644 --- a/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php +++ b/src/Symfony/Component/Security/Http/Logout/LogoutSuccessHandlerInterface.php @@ -33,5 +33,5 @@ interface LogoutSuccessHandlerInterface * * @return Response never null */ - function onLogoutSuccess(Request $request); + public function onLogoutSuccess(Request $request); } diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index 94f883064b..92472eecc8 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -91,7 +91,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * * @return TokenInterface */ - public final function autoLogin(Request $request) + final public function autoLogin(Request $request) { if (null === $cookie = $request->cookies->get($this->options['name'])) { return; @@ -160,7 +160,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * * @return void */ - public final function loginFail(Request $request) + final public function loginFail(Request $request) { $this->cancelCookie($request); $this->onLoginFail($request); @@ -176,7 +176,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * * @return void */ - public final function loginSuccess(Request $request, Response $response, TokenInterface $token) + final public function loginSuccess(Request $request, Response $response, TokenInterface $token) { if (!$token->getUser() instanceof UserInterface) { if (null !== $this->logger) { @@ -229,7 +229,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface */ abstract protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token); - protected final function getUserProvider($class) + final protected function getUserProvider($class) { foreach ($this->userProviders as $provider) { if ($provider->supportsClass($class)) { diff --git a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php index b824538800..116a6b131b 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php +++ b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php @@ -51,7 +51,7 @@ interface RememberMeServicesInterface * * @return TokenInterface */ - function autoLogin(Request $request); + public function autoLogin(Request $request); /** * Called whenever an interactive authentication attempt was made, but the @@ -63,7 +63,7 @@ interface RememberMeServicesInterface * * @return void */ - function loginFail(Request $request); + public function loginFail(Request $request); /** * Called whenever an interactive authentication attempt is successful @@ -82,5 +82,5 @@ interface RememberMeServicesInterface * * @return void */ - function loginSuccess(Request $request, Response $response, TokenInterface $token); + public function loginSuccess(Request $request, Response $response, TokenInterface $token); } diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php index 54924ac332..38dc343287 100644 --- a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php +++ b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php @@ -35,5 +35,5 @@ interface SessionAuthenticationStrategyInterface * * @return void */ - function onAuthentication(Request $request, TokenInterface $token); + public function onAuthentication(Request $request, TokenInterface $token); } diff --git a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php index 41458f0123..aed1aab640 100644 --- a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php +++ b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php @@ -2,7 +2,6 @@ namespace Symfony\Component\Serializer\Encoder; - /* * This file is part of the Symfony framework. * @@ -27,5 +26,5 @@ interface DecoderInterface * * @return mixed */ - function decode($data, $format); + public function decode($data, $format); } diff --git a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php index e846a20c70..9be4518096 100644 --- a/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php +++ b/src/Symfony/Component/Serializer/Encoder/EncoderInterface.php @@ -2,7 +2,6 @@ namespace Symfony\Component\Serializer\Encoder; - /* * This file is part of the Symfony framework. * @@ -27,5 +26,5 @@ interface EncoderInterface * * @return string */ - function encode($data, $format); + public function encode($data, $format); } diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php index 2e874eb617..b544cf2b54 100644 --- a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php +++ b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php @@ -2,7 +2,6 @@ namespace Symfony\Component\Serializer\Encoder; - /* * This file is part of the Symfony framework. * diff --git a/src/Symfony/Component/Serializer/Encoder/NormalizationAwareInterface.php b/src/Symfony/Component/Serializer/Encoder/NormalizationAwareInterface.php index 64fc134dee..8428200eb1 100644 --- a/src/Symfony/Component/Serializer/Encoder/NormalizationAwareInterface.php +++ b/src/Symfony/Component/Serializer/Encoder/NormalizationAwareInterface.php @@ -2,7 +2,6 @@ namespace Symfony\Component\Serializer\Encoder; - /* * This file is part of the Symfony framework. * diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php index 42ef435cf9..8ffe1a779d 100644 --- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php @@ -2,7 +2,6 @@ namespace Symfony\Component\Serializer\Normalizer; - /* * This file is part of the Symfony framework. * diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php index e41622ff15..1c1749d8ba 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php @@ -35,7 +35,7 @@ interface NormalizableInterface * based on different output formats. * @return array|scalar */ - function normalize(SerializerInterface $serializer, $format = null); + public function normalize(SerializerInterface $serializer, $format = null); /** * Denormalizes the object back from an array of scalars|arrays. @@ -49,5 +49,5 @@ interface NormalizableInterface * @param string|null $format The format is optionally given to be able to denormalize differently * based on different input formats. */ - function denormalize(SerializerInterface $serializer, $data, $format = null); + public function denormalize(SerializerInterface $serializer, $data, $format = null); } diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php index 2bd5ea5dee..b0ed6e6057 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php @@ -2,7 +2,6 @@ namespace Symfony\Component\Serializer\Normalizer; - /* * This file is part of the Symfony framework. * @@ -26,7 +25,7 @@ interface NormalizerInterface * @param string $format format the normalization result will be encoded as * @return array|scalar */ - function normalize($object, $format = null); + public function normalize($object, $format = null); /** * Denormalizes data back into an object of the given class @@ -36,7 +35,7 @@ interface NormalizerInterface * @param string $format format the given data was extracted from * @return object */ - function denormalize($data, $class, $format = null); + public function denormalize($data, $class, $format = null); /** * Checks whether the given class is supported for normalization by this normalizer @@ -45,7 +44,7 @@ interface NormalizerInterface * @param string $format The format being (de-)serialized from or into. * @return Boolean */ - function supportsNormalization($data, $format = null); + public function supportsNormalization($data, $format = null); /** * Checks whether the given class is supported for denormalization by this normalizer @@ -55,5 +54,5 @@ interface NormalizerInterface * @param string $format The format being deserialized from. * @return Boolean */ - function supportsDenormalization($data, $type, $format = null); + public function supportsDenormalization($data, $type, $format = null); } diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php index d1236cd152..092b1237a0 100644 --- a/src/Symfony/Component/Serializer/Serializer.php +++ b/src/Symfony/Component/Serializer/Serializer.php @@ -59,7 +59,7 @@ class Serializer implements SerializerInterface /** * {@inheritdoc} */ - public final function serialize($data, $format) + final public function serialize($data, $format) { if (!$this->supportsSerialization($format)) { throw new UnexpectedValueException('Serialization for the format '.$format.' is not supported'); @@ -77,7 +77,7 @@ class Serializer implements SerializerInterface /** * {@inheritdoc} */ - public final function deserialize($data, $type, $format) + final public function deserialize($data, $type, $format) { if (!$this->supportsDeserialization($format)) { throw new UnexpectedValueException('Deserialization for the format '.$format.' is not supported'); @@ -131,7 +131,7 @@ class Serializer implements SerializerInterface /** * {@inheritdoc} */ - public final function encode($data, $format) + final public function encode($data, $format) { return $this->getEncoder($format)->encode($data, $format); } @@ -139,7 +139,7 @@ class Serializer implements SerializerInterface /** * {@inheritdoc} */ - public final function decode($data, $format) + final public function decode($data, $format) { return $this->getEncoder($format)->decode($data, $format); } diff --git a/src/Symfony/Component/Serializer/SerializerAwareInterface.php b/src/Symfony/Component/Serializer/SerializerAwareInterface.php index fe02581b97..e020e7d75f 100644 --- a/src/Symfony/Component/Serializer/SerializerAwareInterface.php +++ b/src/Symfony/Component/Serializer/SerializerAwareInterface.php @@ -25,5 +25,5 @@ interface SerializerAwareInterface * * @param SerializerInterface $serializer */ - function setSerializer(SerializerInterface $serializer); + public function setSerializer(SerializerInterface $serializer); } diff --git a/src/Symfony/Component/Serializer/SerializerInterface.php b/src/Symfony/Component/Serializer/SerializerInterface.php index c008163603..6dc7149492 100644 --- a/src/Symfony/Component/Serializer/SerializerInterface.php +++ b/src/Symfony/Component/Serializer/SerializerInterface.php @@ -27,7 +27,7 @@ interface SerializerInterface * @param string $format format name * @return string */ - function serialize($data, $format); + public function serialize($data, $format); /** * Deserializes data into the given type. @@ -36,7 +36,7 @@ interface SerializerInterface * @param string $type * @param string $format */ - function deserialize($data, $type, $format); + public function deserialize($data, $type, $format); /** * Normalizes any data into a set of arrays/scalars @@ -45,7 +45,7 @@ interface SerializerInterface * @param string $format format name, present to give the option to normalizers to act differently based on formats * @return array|scalar */ - function normalize($data, $format = null); + public function normalize($data, $format = null); /** * Denormalizes data into the given type. @@ -55,7 +55,7 @@ interface SerializerInterface * @param string $format * @return mixed */ - function denormalize($data, $type, $format = null); + public function denormalize($data, $type, $format = null); /** * Encodes data into the given format @@ -64,7 +64,7 @@ interface SerializerInterface * @param string $format format name * @return array|scalar */ - function encode($data, $format); + public function encode($data, $format); /** * Decodes a string from the given format back into PHP data @@ -73,7 +73,7 @@ interface SerializerInterface * @param string $format format name * @return mixed */ - function decode($data, $format); + public function decode($data, $format); /** * Checks whether the serializer can serialize to given format @@ -81,7 +81,7 @@ interface SerializerInterface * @param string $format format name * @return Boolean */ - function supportsSerialization($format); + public function supportsSerialization($format); /** * Checks whether the serializer can deserialize from given format @@ -89,7 +89,7 @@ interface SerializerInterface * @param string $format format name * @return Boolean */ - function supportsDeserialization($format); + public function supportsDeserialization($format); /** * Checks whether the serializer can encode to given format @@ -97,7 +97,7 @@ interface SerializerInterface * @param string $format format name * @return Boolean */ - function supportsEncoding($format); + public function supportsEncoding($format); /** * Checks whether the serializer can decode from given format @@ -105,12 +105,12 @@ interface SerializerInterface * @param string $format format name * @return Boolean */ - function supportsDecoding($format); + public function supportsDecoding($format); /** * Get the encoder for the given format * * @return EncoderInterface */ - function getEncoder($format); + public function getEncoder($format); } diff --git a/src/Symfony/Component/Templating/Asset/PackageInterface.php b/src/Symfony/Component/Templating/Asset/PackageInterface.php index a3dcde979b..a9ec65aecb 100644 --- a/src/Symfony/Component/Templating/Asset/PackageInterface.php +++ b/src/Symfony/Component/Templating/Asset/PackageInterface.php @@ -23,7 +23,7 @@ interface PackageInterface * * @return string The version string */ - function getVersion(); + public function getVersion(); /** * Returns an absolute or root-relative public path. @@ -32,5 +32,5 @@ interface PackageInterface * * @return string The public path */ - function getUrl($path); + public function getUrl($path); } diff --git a/src/Symfony/Component/Templating/DebuggerInterface.php b/src/Symfony/Component/Templating/DebuggerInterface.php index 93e3f45095..43026620ec 100644 --- a/src/Symfony/Component/Templating/DebuggerInterface.php +++ b/src/Symfony/Component/Templating/DebuggerInterface.php @@ -24,5 +24,5 @@ interface DebuggerInterface * * @param string $message A message to log */ - function log($message); + public function log($message); } diff --git a/src/Symfony/Component/Templating/EngineInterface.php b/src/Symfony/Component/Templating/EngineInterface.php index 3f3e29c379..dfa9c55efa 100644 --- a/src/Symfony/Component/Templating/EngineInterface.php +++ b/src/Symfony/Component/Templating/EngineInterface.php @@ -44,7 +44,7 @@ interface EngineInterface * * @api */ - function render($name, array $parameters = array()); + public function render($name, array $parameters = array()); /** * Returns true if the template exists. @@ -55,7 +55,7 @@ interface EngineInterface * * @api */ - function exists($name); + public function exists($name); /** * Returns true if this class is able to render the given template. @@ -66,5 +66,5 @@ interface EngineInterface * * @api */ - function supports($name); + public function supports($name); } diff --git a/src/Symfony/Component/Templating/Helper/HelperInterface.php b/src/Symfony/Component/Templating/Helper/HelperInterface.php index 650a83d5a8..eeb6730da8 100644 --- a/src/Symfony/Component/Templating/Helper/HelperInterface.php +++ b/src/Symfony/Component/Templating/Helper/HelperInterface.php @@ -27,7 +27,7 @@ interface HelperInterface * * @api */ - function getName(); + public function getName(); /** * Sets the default charset. @@ -36,7 +36,7 @@ interface HelperInterface * * @api */ - function setCharset($charset); + public function setCharset($charset); /** * Gets the default charset. @@ -45,5 +45,5 @@ interface HelperInterface * * @api */ - function getCharset(); + public function getCharset(); } diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php index 20badc3410..9e3fe8bb56 100644 --- a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php +++ b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php @@ -108,7 +108,7 @@ class FilesystemLoader extends Loader * * @return true if the path exists and is absolute, false otherwise */ - static protected function isAbsolutePath($file) + protected static function isAbsolutePath($file) { if ($file[0] == '/' || $file[0] == '\\' || (strlen($file) > 3 && ctype_alpha($file[0]) diff --git a/src/Symfony/Component/Templating/Loader/LoaderInterface.php b/src/Symfony/Component/Templating/Loader/LoaderInterface.php index 0e5192c63d..4b6d52562d 100644 --- a/src/Symfony/Component/Templating/Loader/LoaderInterface.php +++ b/src/Symfony/Component/Templating/Loader/LoaderInterface.php @@ -31,7 +31,7 @@ interface LoaderInterface * * @api */ - function load(TemplateReferenceInterface $template); + public function load(TemplateReferenceInterface $template); /** * Returns true if the template is still fresh. @@ -43,5 +43,5 @@ interface LoaderInterface * * @api */ - function isFresh(TemplateReferenceInterface $template, $time); + public function isFresh(TemplateReferenceInterface $template, $time); } diff --git a/src/Symfony/Component/Templating/TemplateNameParserInterface.php b/src/Symfony/Component/Templating/TemplateNameParserInterface.php index bdc406535d..6305f43be2 100644 --- a/src/Symfony/Component/Templating/TemplateNameParserInterface.php +++ b/src/Symfony/Component/Templating/TemplateNameParserInterface.php @@ -30,5 +30,5 @@ interface TemplateNameParserInterface * * @api */ - function parse($name); + public function parse($name); } diff --git a/src/Symfony/Component/Templating/TemplateReferenceInterface.php b/src/Symfony/Component/Templating/TemplateReferenceInterface.php index 0f04742c44..60c910a1cd 100644 --- a/src/Symfony/Component/Templating/TemplateReferenceInterface.php +++ b/src/Symfony/Component/Templating/TemplateReferenceInterface.php @@ -27,7 +27,7 @@ interface TemplateReferenceInterface * * @api */ - function all(); + public function all(); /** * Sets a template parameter. @@ -41,7 +41,7 @@ interface TemplateReferenceInterface * * @api */ - function set($name, $value); + public function set($name, $value); /** * Gets a template parameter. @@ -54,7 +54,7 @@ interface TemplateReferenceInterface * * @api */ - function get($name); + public function get($name); /** * Returns the path to the template. @@ -65,7 +65,7 @@ interface TemplateReferenceInterface * * @api */ - function getPath(); + public function getPath(); /** * Returns the "logical" template name. @@ -76,5 +76,5 @@ interface TemplateReferenceInterface * * @api */ - function getLogicalName(); + public function getLogicalName(); } diff --git a/src/Symfony/Component/Translation/Interval.php b/src/Symfony/Component/Translation/Interval.php index 078e1a4a8e..34532c1d5c 100644 --- a/src/Symfony/Component/Translation/Interval.php +++ b/src/Symfony/Component/Translation/Interval.php @@ -39,7 +39,7 @@ class Interval * @param integer $number A number * @param string $interval An interval */ - static public function test($number, $interval) + public static function test($number, $interval) { $interval = trim($interval); @@ -71,7 +71,7 @@ class Interval * * @return string A Regexp (without the delimiters) */ - static public function getIntervalRegexp() + public static function getIntervalRegexp() { return << = ! % @ ` ]/x', $value); } @@ -81,7 +81,7 @@ class Escaper * * @return string The quoted, escaped string */ - static public function escapeWithSingleQuotes($value) + public static function escapeWithSingleQuotes($value) { return sprintf("'%s'", str_replace('\'', '\'\'', $value)); } diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index 20305728ec..02968d15f9 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -29,7 +29,7 @@ class Inline * * @return array A PHP array representing the YAML string */ - static public function parse($value) + public static function parse($value) { $value = trim($value); @@ -69,7 +69,7 @@ class Inline * * @throws DumpException When trying to dump PHP resource */ - static public function dump($value) + public static function dump($value) { switch (true) { case is_resource($value): @@ -119,7 +119,7 @@ class Inline * * @return string The YAML string representing the PHP array */ - static private function dumpArray($value) + private static function dumpArray($value) { // array $keys = array_keys($value); @@ -156,7 +156,7 @@ class Inline * * @throws ParseException When malformed inline YAML string is parsed */ - static public function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true) + public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true) { if (in_array($scalar[$i], $stringDelimiters)) { // quoted scalar @@ -194,7 +194,7 @@ class Inline * * @throws ParseException When malformed inline YAML string is parsed */ - static private function parseQuotedScalar($scalar, &$i) + private static function parseQuotedScalar($scalar, &$i) { if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) { throw new ParseException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i))); @@ -224,7 +224,7 @@ class Inline * * @throws ParseException When malformed inline YAML string is parsed */ - static private function parseSequence($sequence, &$i = 0) + private static function parseSequence($sequence, &$i = 0) { $output = array(); $len = strlen($sequence); @@ -280,7 +280,7 @@ class Inline * * @throws ParseException When malformed inline YAML string is parsed */ - static private function parseMapping($mapping, &$i = 0) + private static function parseMapping($mapping, &$i = 0) { $output = array(); $len = strlen($mapping); @@ -341,7 +341,7 @@ class Inline * * @return string A YAML string */ - static private function evaluateScalar($scalar) + private static function evaluateScalar($scalar) { $scalar = trim($scalar); @@ -386,7 +386,7 @@ class Inline * * @return string The regular expression */ - static private function getTimestampRegex() + private static function getTimestampRegex() { return <<unescapeCharacter($match[0]); }; diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php index 6ffced97ab..cd5310f24e 100644 --- a/src/Symfony/Component/Yaml/Yaml.php +++ b/src/Symfony/Component/Yaml/Yaml.php @@ -42,7 +42,7 @@ class Yaml * * @api */ - static public function parse($input) + public static function parse($input) { $file = ''; @@ -93,7 +93,7 @@ class Yaml * * @api */ - static public function dump($array, $inline = 2) + public static function dump($array, $inline = 2) { $yaml = new Dumper(); diff --git a/tests/Symfony/Tests/Bridge/Doctrine/DoctrineOrmTestCase.php b/tests/Symfony/Tests/Bridge/Doctrine/DoctrineOrmTestCase.php index 238705e480..99d282343b 100644 --- a/tests/Symfony/Tests/Bridge/Doctrine/DoctrineOrmTestCase.php +++ b/tests/Symfony/Tests/Bridge/Doctrine/DoctrineOrmTestCase.php @@ -28,7 +28,7 @@ abstract class DoctrineOrmTestCase extends \PHPUnit_Framework_TestCase /** * @return EntityManager */ - static public function createTestEntityManager($paths = array()) + public static function createTestEntityManager($paths = array()) { if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) { self::markTestSkipped('This test requires SQLite support in your environment'); diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php index be935ccc96..81252ed581 100644 --- a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php +++ b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionDivLayoutTest.php @@ -89,32 +89,32 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest protected function renderEnctype(FormView $view) { - return (string)$this->extension->renderEnctype($view); + return (string) $this->extension->renderEnctype($view); } protected function renderLabel(FormView $view, $label = null, array $vars = array()) { - return (string)$this->extension->renderLabel($view, $label, $vars); + return (string) $this->extension->renderLabel($view, $label, $vars); } protected function renderErrors(FormView $view) { - return (string)$this->extension->renderErrors($view); + return (string) $this->extension->renderErrors($view); } protected function renderWidget(FormView $view, array $vars = array()) { - return (string)$this->extension->renderWidget($view, $vars); + return (string) $this->extension->renderWidget($view, $vars); } protected function renderRow(FormView $view, array $vars = array()) { - return (string)$this->extension->renderRow($view, $vars); + return (string) $this->extension->renderRow($view, $vars); } protected function renderRest(FormView $view, array $vars = array()) { - return (string)$this->extension->renderRest($view, $vars); + return (string) $this->extension->renderRest($view, $vars); } protected function setTheme(FormView $view, array $themes) @@ -122,14 +122,14 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest $this->extension->setTheme($view, $themes); } - static public function themeBlockInheritanceProvider() + public static function themeBlockInheritanceProvider() { return array( array(array('theme.html.twig')) ); } - static public function themeInheritanceProvider() + public static function themeInheritanceProvider() { return array( array(array('parent_label.html.twig'), array('child_label.html.twig')) diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php index bb7e44743f..60a6b4453d 100644 --- a/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php +++ b/tests/Symfony/Tests/Bridge/Twig/Extension/FormExtensionTableLayoutTest.php @@ -59,32 +59,32 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest protected function renderEnctype(FormView $view) { - return (string)$this->extension->renderEnctype($view); + return (string) $this->extension->renderEnctype($view); } protected function renderLabel(FormView $view, $label = null, array $vars = array()) { - return (string)$this->extension->renderLabel($view, $label, $vars); + return (string) $this->extension->renderLabel($view, $label, $vars); } protected function renderErrors(FormView $view) { - return (string)$this->extension->renderErrors($view); + return (string) $this->extension->renderErrors($view); } protected function renderWidget(FormView $view, array $vars = array()) { - return (string)$this->extension->renderWidget($view, $vars); + return (string) $this->extension->renderWidget($view, $vars); } protected function renderRow(FormView $view, array $vars = array()) { - return (string)$this->extension->renderRow($view, $vars); + return (string) $this->extension->renderRow($view, $vars); } protected function renderRest(FormView $view, array $vars = array()) { - return (string)$this->extension->renderRest($view, $vars); + return (string) $this->extension->renderRest($view, $vars); } protected function setTheme(FormView $view, array $themes) diff --git a/tests/Symfony/Tests/Component/Config/Definition/BooleanNodeTest.php b/tests/Symfony/Tests/Component/Config/Definition/BooleanNodeTest.php index 537968e91a..c4ed01c662 100644 --- a/tests/Symfony/Tests/Component/Config/Definition/BooleanNodeTest.php +++ b/tests/Symfony/Tests/Component/Config/Definition/BooleanNodeTest.php @@ -58,4 +58,3 @@ class BooleanNodeTest extends \PHPUnit_Framework_TestCase ); } } - diff --git a/tests/Symfony/Tests/Component/Console/ApplicationTest.php b/tests/Symfony/Tests/Component/Console/ApplicationTest.php index 4282c2368f..481ed5f9a5 100644 --- a/tests/Symfony/Tests/Component/Console/ApplicationTest.php +++ b/tests/Symfony/Tests/Component/Console/ApplicationTest.php @@ -17,9 +17,9 @@ use Symfony\Component\Console\Tester\ApplicationTester; class ApplicationTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = realpath(__DIR__.'/Fixtures/'); require_once self::$fixturesPath.'/FooCommand.php'; diff --git a/tests/Symfony/Tests/Component/Console/Command/CommandTest.php b/tests/Symfony/Tests/Component/Console/Command/CommandTest.php index df1b354e11..50858823a8 100644 --- a/tests/Symfony/Tests/Component/Console/Command/CommandTest.php +++ b/tests/Symfony/Tests/Component/Console/Command/CommandTest.php @@ -25,9 +25,9 @@ use Symfony\Component\Console\Tester\CommandTester; class CommandTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = __DIR__.'/../Fixtures/'; require_once self::$fixturesPath.'/TestCommand.php'; diff --git a/tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php b/tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php index a119b8bc8a..74ba3e3b23 100644 --- a/tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php +++ b/tests/Symfony/Tests/Component/Console/Input/InputDefinitionTest.php @@ -17,11 +17,11 @@ use Symfony\Component\Console\Input\InputOption; class InputDefinitionTest extends \PHPUnit_Framework_TestCase { - static protected $fixtures; + protected static $fixtures; protected $foo, $bar, $foo1, $foo2; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixtures = __DIR__.'/../Fixtures/'; } @@ -97,7 +97,6 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase $this->assertEquals('Cannot add an argument after an array argument.', $e->getMessage()); } - // cannot add a required argument after an optional one $definition = new InputDefinition(); $definition->addArgument($this->foo); diff --git a/tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php b/tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php index ac10350cc8..c712ce66d9 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php @@ -508,5 +508,4 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase } } - class FooClass {} diff --git a/tests/Symfony/Tests/Component/DependencyInjection/CrossCheckTest.php b/tests/Symfony/Tests/Component/DependencyInjection/CrossCheckTest.php index 2b9554b147..659aed461f 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/CrossCheckTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/CrossCheckTest.php @@ -16,9 +16,9 @@ use Symfony\Component\Config\FileLocator; class CrossCheckTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = __DIR__.'/Fixtures/'; diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Dumper/GraphvizDumperTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Dumper/GraphvizDumperTest.php index 0ac8fd38a5..2135772543 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Dumper/GraphvizDumperTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Dumper/GraphvizDumperTest.php @@ -16,9 +16,9 @@ use Symfony\Component\DependencyInjection\Dumper\GraphvizDumper; class GraphvizDumperTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = __DIR__.'/../Fixtures/'; } diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Dumper/PhpDumperTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Dumper/PhpDumperTest.php index 402a9fdc89..221a007541 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Dumper/PhpDumperTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Dumper/PhpDumperTest.php @@ -19,9 +19,9 @@ use Symfony\Component\DependencyInjection\Definition; class PhpDumperTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = realpath(__DIR__.'/../Fixtures/'); } diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Dumper/XmlDumperTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Dumper/XmlDumperTest.php index 143065123a..7ca1e07462 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Dumper/XmlDumperTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Dumper/XmlDumperTest.php @@ -16,9 +16,9 @@ use Symfony\Component\DependencyInjection\Dumper\XmlDumper; class XmlDumperTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = realpath(__DIR__.'/../Fixtures/'); } diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Dumper/YamlDumperTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Dumper/YamlDumperTest.php index 83763897cb..38fd2a4ba0 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Dumper/YamlDumperTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Dumper/YamlDumperTest.php @@ -16,9 +16,9 @@ use Symfony\Component\DependencyInjection\Dumper\YamlDumper; class YamlDumperTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = realpath(__DIR__.'/../Fixtures/'); } diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/includes/classes.php b/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/includes/classes.php index 3c27376591..514df23e51 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/includes/classes.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/includes/classes.php @@ -16,17 +16,17 @@ class BazClass $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() { } } diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Loader/IniFileLoaderTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Loader/IniFileLoaderTest.php index dd430d1588..1fd6469d96 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Loader/IniFileLoaderTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Loader/IniFileLoaderTest.php @@ -17,9 +17,9 @@ use Symfony\Component\Config\FileLocator; class IniFileLoaderTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = realpath(__DIR__.'/../Fixtures/'); } diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php index b7f54f657d..c40003e669 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php @@ -25,9 +25,9 @@ use Symfony\Component\Config\FileLocator; class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = realpath(__DIR__.'/../Fixtures/'); require_once self::$fixturesPath.'/includes/foo.php'; diff --git a/tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php b/tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php index bd84b3f5ca..7f6a37bbb4 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php @@ -23,9 +23,9 @@ use Symfony\Component\Config\FileLocator; class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = realpath(__DIR__.'/../Fixtures/'); require_once self::$fixturesPath.'/includes/foo.php'; diff --git a/tests/Symfony/Tests/Component/Finder/FinderTest.php b/tests/Symfony/Tests/Component/Finder/FinderTest.php index 5135f04c73..d05e329360 100644 --- a/tests/Symfony/Tests/Component/Finder/FinderTest.php +++ b/tests/Symfony/Tests/Component/Finder/FinderTest.php @@ -17,9 +17,9 @@ require_once __DIR__.'/Iterator/RealIteratorTestCase.php'; class FinderTest extends Iterator\RealIteratorTestCase { - static protected $tmpDir; + protected static $tmpDir; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { parent::setUpBeforeClass(); diff --git a/tests/Symfony/Tests/Component/Finder/Iterator/RealIteratorTestCase.php b/tests/Symfony/Tests/Component/Finder/Iterator/RealIteratorTestCase.php index 27a1e12e8d..15a193e1ef 100644 --- a/tests/Symfony/Tests/Component/Finder/Iterator/RealIteratorTestCase.php +++ b/tests/Symfony/Tests/Component/Finder/Iterator/RealIteratorTestCase.php @@ -15,9 +15,9 @@ require_once __DIR__.'/IteratorTestCase.php'; abstract class RealIteratorTestCase extends IteratorTestCase { - static protected $files; + protected static $files; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { $tmpDir = sys_get_temp_dir().'/symfony2_finder'; self::$files = array( @@ -50,7 +50,7 @@ abstract class RealIteratorTestCase extends IteratorTestCase touch($tmpDir.'/test.php', strtotime('2005-10-15')); } - static public function tearDownAfterClass() + public static function tearDownAfterClass() { foreach (array_reverse(self::$files) as $file) { if ('/' === $file[strlen($file) - 1]) { diff --git a/tests/Symfony/Tests/Component/Form/AbstractLayoutTest.php b/tests/Symfony/Tests/Component/Form/AbstractLayoutTest.php index 22e5f1a3ea..957eff995d 100644 --- a/tests/Symfony/Tests/Component/Form/AbstractLayoutTest.php +++ b/tests/Symfony/Tests/Component/Form/AbstractLayoutTest.php @@ -386,7 +386,6 @@ abstract class AbstractLayoutTest extends \PHPUnit_Framework_TestCase ); } - public function testSingleChoiceWithPreferredAndNoSeparator() { $form = $this->factory->createNamed('choice', 'na&me', '&a', array( diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php index bf91f167f0..8632a12452 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php @@ -107,12 +107,12 @@ class DateTimeToArrayTransformerTest extends DateTimeTestCase $dateTime = new \DateTime('2010-02-03 04:05:06 America/New_York'); $dateTime->setTimezone(new \DateTimeZone('Asia/Hong_Kong')); $output = array( - 'year' => (string)(int)$dateTime->format('Y'), - 'month' => (string)(int)$dateTime->format('m'), - 'day' => (string)(int)$dateTime->format('d'), - 'hour' => (string)(int)$dateTime->format('H'), - 'minute' => (string)(int)$dateTime->format('i'), - 'second' => (string)(int)$dateTime->format('s'), + 'year' => (string) (int) $dateTime->format('Y'), + 'month' => (string) (int) $dateTime->format('m'), + 'day' => (string) (int) $dateTime->format('d'), + 'hour' => (string) (int) $dateTime->format('H'), + 'minute' => (string) (int) $dateTime->format('i'), + 'second' => (string) (int) $dateTime->format('s'), ); $this->assertSame($output, $transformer->transform($input)); diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php index d4acca7fed..54c34d12fd 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php @@ -15,7 +15,6 @@ require_once __DIR__ . '/LocalizedTestCase.php'; use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer; - class MoneyToLocalizedStringTransformerTest extends LocalizedTestCase { protected function setUp() diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CountryTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CountryTypeTest.php index ff79433e0e..53ff1bf98b 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CountryTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/CountryTypeTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; - class CountryTypeTest extends LocalizedTestCase { public function testCountriesAreSelectable() diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php index ca401a0422..b0860d2d4b 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/DateTimeTypeTest.php @@ -142,14 +142,14 @@ class DateTimeTypeTest extends LocalizedTestCase $form->bind(array( 'date' => array( - 'day' => (int)$dateTime->format('d'), - 'month' => (int)$dateTime->format('m'), - 'year' => (int)$dateTime->format('Y'), + 'day' => (int) $dateTime->format('d'), + 'month' => (int) $dateTime->format('m'), + 'year' => (int) $dateTime->format('Y'), ), 'time' => array( - 'hour' => (int)$dateTime->format('H'), - 'minute' => (int)$dateTime->format('i'), - 'second' => (int)$dateTime->format('s'), + 'hour' => (int) $dateTime->format('H'), + 'minute' => (int) $dateTime->format('i'), + 'second' => (int) $dateTime->format('s'), ), )); diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/IntegerTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/IntegerTypeTest.php index 5dc8958996..c2806b7637 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/IntegerTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/IntegerTypeTest.php @@ -13,7 +13,6 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; require_once __DIR__ . '/LocalizedTestCase.php'; - class IntegerTypeTest extends LocalizedTestCase { public function testSubmitCastsToInteger() diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/LanguageTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/LanguageTypeTest.php index 096b568edd..ac54825704 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/LanguageTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/LanguageTypeTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; - class LanguageTypeTest extends LocalizedTestCase { public function testCountriesAreSelectable() diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/LocaleTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/LocaleTypeTest.php index c813c6c3cc..2f80bec646 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/LocaleTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/LocaleTypeTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; - class LocaleTypeTest extends LocalizedTestCase { public function testLocalesAreSelectable() diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/PasswordTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/PasswordTypeTest.php index ac621e0727..f361153686 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/PasswordTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/PasswordTypeTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; - class PasswordTypeTest extends TypeTestCase { public function testEmptyIfNotBound() diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/RepeatedTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/RepeatedTypeTest.php index d7f1218ec0..fdc45b5dab 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/RepeatedTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/RepeatedTypeTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; - class RepeatedTypeTest extends TypeTestCase { protected $form; diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimeTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimeTypeTest.php index c9ba9a02d0..db2de5c7bb 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimeTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimeTypeTest.php @@ -13,7 +13,6 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; require_once __DIR__ . '/LocalizedTestCase.php'; - class TimeTypeTest extends LocalizedTestCase { public function testSubmit_dateTime() @@ -200,9 +199,9 @@ class TimeTypeTest extends LocalizedTestCase $outputTime->setTimezone(new \DateTimeZone('Asia/Hong_Kong')); $displayedData = array( - 'hour' => (int)$outputTime->format('H'), - 'minute' => (int)$outputTime->format('i'), - 'second' => (int)$outputTime->format('s') + 'hour' => (int) $outputTime->format('H'), + 'minute' => (int) $outputTime->format('i'), + 'second' => (int) $outputTime->format('s') ); $this->assertEquals($displayedData, $form->getClientData()); @@ -226,9 +225,9 @@ class TimeTypeTest extends LocalizedTestCase $outputTime->setTimezone(new \DateTimeZone('Asia/Hong_Kong')); $displayedData = array( - 'hour' => (int)$outputTime->format('H'), - 'minute' => (int)$outputTime->format('i'), - 'second' => (int)$outputTime->format('s') + 'hour' => (int) $outputTime->format('H'), + 'minute' => (int) $outputTime->format('i'), + 'second' => (int) $outputTime->format('s') ); $this->assertDateTimeEquals($dateTime, $form->getData()); diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimezoneTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimezoneTypeTest.php index 94e32f9a87..2c2e357885 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimezoneTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/TimezoneTypeTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; - class TimezoneTypeTest extends TypeTestCase { public function testTimezonesAreSelectable() diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/UrlTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/UrlTypeTest.php index be9773e11b..1631327dac 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/UrlTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/UrlTypeTest.php @@ -13,7 +13,6 @@ namespace Symfony\Tests\Component\Form\Extension\Core\Type; require_once __DIR__ . '/LocalizedTestCase.php'; - class UrlTypeTest extends LocalizedTestCase { public function testSubmitAddsDefaultProtocolIfNoneIsIncluded() diff --git a/tests/Symfony/Tests/Component/Form/Extension/Validator/Validator/DelegatingValidatorTest.php b/tests/Symfony/Tests/Component/Form/Extension/Validator/Validator/DelegatingValidatorTest.php index 4316cf0344..2b8222233a 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Validator/Validator/DelegatingValidatorTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Validator/Validator/DelegatingValidatorTest.php @@ -224,7 +224,7 @@ class DelegatingValidatorTest extends \PHPUnit_Framework_TestCase $parent = $this->getForm(); for ($i = 0; $i < 2; $i++) { - $child = $this->getForm((string)$i, '['.$i.']'); + $child = $this->getForm((string) $i, '['.$i.']'); $child->add($this->getForm('firstName')); $parent->add($child); } @@ -417,7 +417,7 @@ class DelegatingValidatorTest extends \PHPUnit_Framework_TestCase $parent->add($child); for ($i = 0; $i < 2; $i++) { - $collection = $this->getForm((string)$i, '['.$i.']'); + $collection = $this->getForm((string) $i, '['.$i.']'); $collection->add($this->getForm('street')); $child->add($collection); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/File/UploadedFileTest.php b/tests/Symfony/Tests/Component/HttpFoundation/File/UploadedFileTest.php index 85879ea4a1..8c5a0cefc2 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/File/UploadedFileTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/File/UploadedFileTest.php @@ -208,7 +208,6 @@ class UploadedFileTest extends \PHPUnit_Framework_TestCase $this->assertFalse($file->isValid()); } - public function uploadedFileErrorProvider() { return array( diff --git a/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php b/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php index e1dd5b15dc..d0bf27b9a5 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Component\HttpFoundation; - use Symfony\Component\HttpFoundation\SessionStorage\ArraySessionStorage; use Symfony\Component\HttpFoundation\Session; diff --git a/tests/Symfony/Tests/Component/HttpFoundation/SessionStorage/PdoSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/SessionStorage/PdoSessionStorageTest.php index 832a021d81..13d1388c90 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/SessionStorage/PdoSessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/SessionStorage/PdoSessionStorageTest.php @@ -57,4 +57,3 @@ class PdoSessionStorageTest extends \PHPUnit_Framework_TestCase $this->assertEquals(0, count($this->pdo->query('SELECT * FROM sessions')->fetchAll())); } } - diff --git a/tests/Symfony/Tests/Component/HttpKernel/Controller/ControllerResolverTest.php b/tests/Symfony/Tests/Component/HttpKernel/Controller/ControllerResolverTest.php index 3bf157d180..b263a37e56 100644 --- a/tests/Symfony/Tests/Component/HttpKernel/Controller/ControllerResolverTest.php +++ b/tests/Symfony/Tests/Component/HttpKernel/Controller/ControllerResolverTest.php @@ -147,7 +147,7 @@ class ControllerResolverTest extends \PHPUnit_Framework_TestCase { } - static protected function controllerMethod4() + protected static function controllerMethod4() { } diff --git a/tests/Symfony/Tests/Component/HttpKernel/DataCollector/EventDataCollectorTest.php b/tests/Symfony/Tests/Component/HttpKernel/DataCollector/EventDataCollectorTest.php index 2841f12784..848197d31a 100644 --- a/tests/Symfony/Tests/Component/HttpKernel/DataCollector/EventDataCollectorTest.php +++ b/tests/Symfony/Tests/Component/HttpKernel/DataCollector/EventDataCollectorTest.php @@ -35,12 +35,12 @@ class EventDataCollectorTest extends \PHPUnit_Framework_TestCase class TestEventDispatcher extends EventDispatcher implements TraceableEventDispatcherInterface { - function getCalledListeners() + public function getCalledListeners() { return array('foo'); } - function getNotCalledListeners() + public function getNotCalledListeners() { return array('bar'); } diff --git a/tests/Symfony/Tests/Component/HttpKernel/HttpCache/HttpCacheTestCase.php b/tests/Symfony/Tests/Component/HttpKernel/HttpCache/HttpCacheTestCase.php index b9f287a19e..baa0e0380b 100644 --- a/tests/Symfony/Tests/Component/HttpKernel/HttpCache/HttpCacheTestCase.php +++ b/tests/Symfony/Tests/Component/HttpKernel/HttpCache/HttpCacheTestCase.php @@ -153,7 +153,7 @@ class HttpCacheTestCase extends \PHPUnit_Framework_TestCase $this->catch = $catch; } - static public function clearDirectory($directory) + public static function clearDirectory($directory) { if (!is_dir($directory)) { return; diff --git a/tests/Symfony/Tests/Component/HttpKernel/HttpKernelTest.php b/tests/Symfony/Tests/Component/HttpKernel/HttpKernelTest.php index 410074498c..d773290a85 100644 --- a/tests/Symfony/Tests/Component/HttpKernel/HttpKernelTest.php +++ b/tests/Symfony/Tests/Component/HttpKernel/HttpKernelTest.php @@ -196,7 +196,7 @@ class Controller return new Response('foo'); } - static public function staticController() + public static function staticController() { return new Response('foo'); } diff --git a/tests/Symfony/Tests/Component/Locale/Stub/StubNumberFormatterTest.php b/tests/Symfony/Tests/Component/Locale/Stub/StubNumberFormatterTest.php index 753ef602ad..bb9fc85991 100644 --- a/tests/Symfony/Tests/Component/Locale/Stub/StubNumberFormatterTest.php +++ b/tests/Symfony/Tests/Component/Locale/Stub/StubNumberFormatterTest.php @@ -194,7 +194,6 @@ class StubNumberFormatterTest extends LocaleTestCase $this->assertEquals(sprintf($expected, $symbol), $formatter->formatCurrency($value, $currency)); } - public function formatCurrencyWithCurrencyStyleSwissRoundingProvider() { // The currency symbol was updated from 4.2 to the 4.4 version. The ICU CLDR data was updated in 2010-03-03, diff --git a/tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php b/tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php index 25b73f9045..adaf940b8d 100644 --- a/tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php +++ b/tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php @@ -58,7 +58,7 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase //TODO maybe php executable is custom or even windows if (defined('PHP_WINDOWS_VERSION_BUILD')) { $this->assertTrue(is_executable($current)); - $this->assertTrue((bool)preg_match('/'.addSlashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable php with suffixes'); + $this->assertTrue((bool) preg_match('/'.addSlashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable php with suffixes'); } } } diff --git a/tests/Symfony/Tests/Component/Routing/Annotation/RouteTest.php b/tests/Symfony/Tests/Component/Routing/Annotation/RouteTest.php index 4ef8fbab50..1510d2b277 100644 --- a/tests/Symfony/Tests/Component/Routing/Annotation/RouteTest.php +++ b/tests/Symfony/Tests/Component/Routing/Annotation/RouteTest.php @@ -43,4 +43,3 @@ class RouteTest extends \PHPUnit_Framework_TestCase ); } } - diff --git a/tests/Symfony/Tests/Component/Routing/Fixtures/validpattern.yml b/tests/Symfony/Tests/Component/Routing/Fixtures/validpattern.yml index 8d79b2b276..8f1fd5dbde 100644 --- a/tests/Symfony/Tests/Component/Routing/Fixtures/validpattern.yml +++ b/tests/Symfony/Tests/Component/Routing/Fixtures/validpattern.yml @@ -1,4 +1,3 @@ blog_show: pattern: /blog/{slug} defaults: { _controller: MyBlogBundle:Blog:show } - diff --git a/tests/Symfony/Tests/Component/Routing/Loader/AbstractAnnotationLoaderTest.php b/tests/Symfony/Tests/Component/Routing/Loader/AbstractAnnotationLoaderTest.php index 1d74990096..586d5f9eda 100644 --- a/tests/Symfony/Tests/Component/Routing/Loader/AbstractAnnotationLoaderTest.php +++ b/tests/Symfony/Tests/Component/Routing/Loader/AbstractAnnotationLoaderTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Component\Routing\Loader; - abstract class AbstractAnnotationLoaderTest extends \PHPUnit_Framework_TestCase { public function setUp() diff --git a/tests/Symfony/Tests/Component/Routing/Loader/PhpFileLoaderTest.php b/tests/Symfony/Tests/Component/Routing/Loader/PhpFileLoaderTest.php index b2b3607864..5de28d39a2 100644 --- a/tests/Symfony/Tests/Component/Routing/Loader/PhpFileLoaderTest.php +++ b/tests/Symfony/Tests/Component/Routing/Loader/PhpFileLoaderTest.php @@ -41,4 +41,3 @@ class PhpFileLoaderTest extends \PHPUnit_Framework_TestCase $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes); } } - diff --git a/tests/Symfony/Tests/Component/Routing/Loader/XmlFileLoaderTest.php b/tests/Symfony/Tests/Component/Routing/Loader/XmlFileLoaderTest.php index 0fe61f975f..e19f1e089d 100644 --- a/tests/Symfony/Tests/Component/Routing/Loader/XmlFileLoaderTest.php +++ b/tests/Symfony/Tests/Component/Routing/Loader/XmlFileLoaderTest.php @@ -87,4 +87,3 @@ class CustomXmlFileLoader extends XmlFileLoader return true; } } - diff --git a/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/ApacheMatcherDumperTest.php b/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/ApacheMatcherDumperTest.php index d29dfd1909..30acda5c1d 100644 --- a/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/ApacheMatcherDumperTest.php +++ b/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/ApacheMatcherDumperTest.php @@ -17,9 +17,9 @@ use Symfony\Component\Routing\Matcher\Dumper\ApacheMatcherDumper; class ApacheMatcherDumperTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = realpath(__DIR__.'/../../Fixtures/'); } diff --git a/tests/Symfony/Tests/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategyTest.php b/tests/Symfony/Tests/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategyTest.php index ff9390573a..135c94636e 100644 --- a/tests/Symfony/Tests/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategyTest.php +++ b/tests/Symfony/Tests/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategyTest.php @@ -116,7 +116,6 @@ class SecurityIdentityRetrievalStrategyTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($username)) ; - return $account; } @@ -177,7 +176,6 @@ class SecurityIdentityRetrievalStrategyTest extends \PHPUnit_Framework_TestCase ; } - return new SecurityIdentityRetrievalStrategy($roleHierarchy, $trustResolver); } } diff --git a/tests/Symfony/Tests/Component/Security/Core/Authentication/Provider/DaoAuthenticationProviderTest.php b/tests/Symfony/Tests/Component/Security/Core/Authentication/Provider/DaoAuthenticationProviderTest.php index 3d3ddaba30..04303c1feb 100644 --- a/tests/Symfony/Tests/Component/Security/Core/Authentication/Provider/DaoAuthenticationProviderTest.php +++ b/tests/Symfony/Tests/Component/Security/Core/Authentication/Provider/DaoAuthenticationProviderTest.php @@ -11,7 +11,6 @@ namespace Symfony\Tests\Component\Security\Core\Authentication\Provider; - use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder; use Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider; diff --git a/tests/Symfony/Tests/Component/Templating/Loader/FilesystemLoaderTest.php b/tests/Symfony/Tests/Component/Templating/Loader/FilesystemLoaderTest.php index 3e23737a28..3b90aedb98 100644 --- a/tests/Symfony/Tests/Component/Templating/Loader/FilesystemLoaderTest.php +++ b/tests/Symfony/Tests/Component/Templating/Loader/FilesystemLoaderTest.php @@ -19,9 +19,9 @@ use Symfony\Component\Templating\TemplateReference; class FilesystemLoaderTest extends \PHPUnit_Framework_TestCase { - static protected $fixturesPath; + protected static $fixturesPath; - static public function setUpBeforeClass() + public static function setUpBeforeClass() { self::$fixturesPath = realpath(__DIR__.'/../Fixtures/'); } @@ -78,7 +78,7 @@ class ProjectTemplateLoader2 extends FilesystemLoader return $this->templatePathPatterns; } - static public function isAbsolutePath($path) + public static function isAbsolutePath($path) { return parent::isAbsolutePath($path); } diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/CollectionValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/CollectionValidatorTest.php index 2ab498ad14..d4e2b1d8da 100644 --- a/tests/Symfony/Tests/Component/Validator/Constraints/CollectionValidatorTest.php +++ b/tests/Symfony/Tests/Component/Validator/Constraints/CollectionValidatorTest.php @@ -355,4 +355,3 @@ class CollectionValidatorTest extends \PHPUnit_Framework_TestCase ); } } - diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/NotBlankValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/NotBlankValidatorTest.php index 27dbc43a13..046324baab 100644 --- a/tests/Symfony/Tests/Component/Validator/Constraints/NotBlankValidatorTest.php +++ b/tests/Symfony/Tests/Component/Validator/Constraints/NotBlankValidatorTest.php @@ -78,4 +78,3 @@ class NotBlankValidatorTest extends \PHPUnit_Framework_TestCase $this->assertEquals($this->validator->getMessageParameters(), array()); } } - diff --git a/tests/Symfony/Tests/Component/Validator/Mapping/ClassMetadataTest.php b/tests/Symfony/Tests/Component/Validator/Mapping/ClassMetadataTest.php index 31f7e2ec08..159e1073bf 100644 --- a/tests/Symfony/Tests/Component/Validator/Mapping/ClassMetadataTest.php +++ b/tests/Symfony/Tests/Component/Validator/Mapping/ClassMetadataTest.php @@ -190,4 +190,3 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase $this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup(), Constraint::DEFAULT_GROUP)); } } - diff --git a/tests/Symfony/Tests/Component/Validator/Mapping/GetterMetadataTest.php b/tests/Symfony/Tests/Component/Validator/Mapping/GetterMetadataTest.php index c54f9e1572..48320b009b 100644 --- a/tests/Symfony/Tests/Component/Validator/Mapping/GetterMetadataTest.php +++ b/tests/Symfony/Tests/Component/Validator/Mapping/GetterMetadataTest.php @@ -38,4 +38,3 @@ class GetterMetadataTest extends \PHPUnit_Framework_TestCase $this->assertEquals('foobar from getter', $metadata->getValue($entity)); } } - diff --git a/tests/Symfony/Tests/Component/Validator/Mapping/Loader/LoaderChainTest.php b/tests/Symfony/Tests/Component/Validator/Mapping/Loader/LoaderChainTest.php index f46c96b1b6..95cc841ea9 100644 --- a/tests/Symfony/Tests/Component/Validator/Mapping/Loader/LoaderChainTest.php +++ b/tests/Symfony/Tests/Component/Validator/Mapping/Loader/LoaderChainTest.php @@ -82,4 +82,3 @@ class LoaderChainTest extends \PHPUnit_Framework_TestCase $this->assertFalse($chain->loadClassMetadata($metadata)); } } - diff --git a/tests/Symfony/Tests/Component/Validator/Mapping/Loader/StaticMethodLoaderTest.php b/tests/Symfony/Tests/Component/Validator/Mapping/Loader/StaticMethodLoaderTest.php index daaf89f6e9..e497ed683e 100644 --- a/tests/Symfony/Tests/Component/Validator/Mapping/Loader/StaticMethodLoaderTest.php +++ b/tests/Symfony/Tests/Component/Validator/Mapping/Loader/StaticMethodLoaderTest.php @@ -61,7 +61,7 @@ class StaticMethodLoaderTest extends \PHPUnit_Framework_TestCase class StaticLoaderEntity { - static public $invokedWith = null; + public static $invokedWith = null; public static function loadMetadata(ClassMetadata $metadata) { @@ -75,7 +75,7 @@ class StaticLoaderDocument extends BaseStaticLoaderDocument class BaseStaticLoaderDocument { - static public function loadMetadata(ClassMetadata $metadata) + public static function loadMetadata(ClassMetadata $metadata) { $metadata->addConstraint(new ConstraintA()); } diff --git a/tests/Symfony/Tests/Component/Validator/Mapping/PropertyMetadataTest.php b/tests/Symfony/Tests/Component/Validator/Mapping/PropertyMetadataTest.php index a6e1662360..37225da790 100644 --- a/tests/Symfony/Tests/Component/Validator/Mapping/PropertyMetadataTest.php +++ b/tests/Symfony/Tests/Component/Validator/Mapping/PropertyMetadataTest.php @@ -35,4 +35,3 @@ class PropertyMetadataTest extends \PHPUnit_Framework_TestCase $this->assertEquals('foobar', $metadata->getValue($entity)); } } - diff --git a/tests/Symfony/Tests/Component/Yaml/Fixtures/YtsErrorTests.yml b/tests/Symfony/Tests/Component/Yaml/Fixtures/YtsErrorTests.yml index 753d82947b..e8506fcb66 100644 --- a/tests/Symfony/Tests/Component/Yaml/Fixtures/YtsErrorTests.yml +++ b/tests/Symfony/Tests/Component/Yaml/Fixtures/YtsErrorTests.yml @@ -23,4 +23,3 @@ yaml: | secondline: 2 php: | array('foo' => null, 'firstline' => 1, 'secondline' => 2) -