Fabien Potencier 14 lat temu
rodzic
commit
a232c148eb
19 zmienionych plików z 25 dodań i 25 usunięć
  1. 1 1
      src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php
  2. 1 1
      src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php
  3. 1 1
      src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
  4. 1 1
      src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/CodeHelperTest.php
  5. 1 1
      src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php
  6. 1 1
      src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
  7. 2 2
      src/Symfony/Component/Config/Definition/Processor.php
  8. 1 1
      src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
  9. 1 1
      src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
  10. 1 1
      src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
  11. 1 1
      src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
  12. 1 1
      src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
  13. 1 1
      src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php
  14. 4 4
      src/Symfony/Component/Locale/Stub/StubIntl.php
  15. 1 1
      src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
  16. 2 2
      src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php
  17. 1 1
      src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
  18. 1 1
      src/Symfony/Component/Validator/ValidatorFactory.php
  19. 2 2
      src/Symfony/Component/Yaml/Yaml.php

+ 1 - 1
src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php

@@ -25,7 +25,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  */
 class MergeCollectionListener implements EventSubscriberInterface
 {
-    public static function getSubscribedEvents()
+    static public function getSubscribedEvents()
     {
         return array(FormEvents::BIND_NORM_DATA => 'onBindNormData');
     }

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php

@@ -24,7 +24,7 @@ class CompilerDebugDumpPass implements CompilerPassInterface
         $cache->write(implode("\n", $container->getCompiler()->getLog()));
     }
 
-    public static function getCompilerLogFilename(ContainerInterface $container)
+    static public function getCompilerLogFilename(ContainerInterface $container)
     {
         $class = $container->getParameter('kernel.container_class');
 

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php

@@ -215,7 +215,7 @@ class CodeHelper extends Helper
         return 'code';
     }
 
-    protected static function fixCodeMarkup($line)
+    static protected function fixCodeMarkup($line)
     {
         // </span> ending tag from previous line
         $opening = strpos($line, '<span');

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/CodeHelperTest.php

@@ -17,7 +17,7 @@ class CodeHelperTest extends \PHPUnit_Framework_TestCase
 {
     protected static $helper;
 
-    public static function setUpBeforeClass()
+    static public function setUpBeforeClass()
     {
         self::$helper = new CodeHelper('format', '/root');
     }

+ 1 - 1
src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php

@@ -16,7 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
 
 class WebTestCase extends BaseWebTestCase
 {
-    public static function assertRedirect($response, $location)
+    static public function assertRedirect($response, $location)
     {
         self::assertTrue($response->isRedirect());
         self::assertEquals('http://localhost'.$location, $response->headers->get('Location'));

+ 1 - 1
src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php

@@ -211,7 +211,7 @@ class ExprBuilder
      *
      * @return array
      */
-    public static function buildExpressions(array $expressions)
+    static public function buildExpressions(array $expressions)
     {
         foreach ($expressions as $k => $expr) {
             if ($expr instanceof ExprBuilder) {

+ 2 - 2
src/Symfony/Component/Config/Definition/Processor.php

@@ -65,7 +65,7 @@ class Processor
      *
      * @return array the config with normalized keys
      */
-    public static function normalizeKeys(array $config)
+    static public function normalizeKeys(array $config)
     {
         foreach ($config as $key => $value) {
             if (is_array($value)) {
@@ -104,7 +104,7 @@ class Processor
      *
      * @return array
      */
-    public static function normalizeConfig($config, $key, $plural = null)
+    static public function normalizeConfig($config, $key, $plural = null)
     {
         if (null === $plural) {
             $plural = $key.'s';

+ 1 - 1
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));
     }
 
-    public static function getSubscribedEvents()
+    static public function getSubscribedEvents()
     {
         return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData');
     }

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php

@@ -38,7 +38,7 @@ class FixUrlProtocolListener implements EventSubscriberInterface
         }
     }
 
-    public static function getSubscribedEvents()
+    static public function getSubscribedEvents()
     {
         return array(FormEvents::BIND_NORM_DATA => 'onBindNormData');
     }

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php

@@ -61,7 +61,7 @@ class ResizeFormListener implements EventSubscriberInterface
         $this->options = $options;
     }
 
-    public static function getSubscribedEvents()
+    static public function getSubscribedEvents()
     {
         return array(
             FormEvents::PRE_SET_DATA => 'preSetData',

+ 1 - 1
src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php

@@ -31,7 +31,7 @@ class TrimListener implements EventSubscriberInterface
         }
     }
 
-    public static function getSubscribedEvents()
+    static public function getSubscribedEvents()
     {
         return array(FormEvents::BIND_CLIENT_DATA => 'onBindClientData');
     }

+ 1 - 1
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
      */
-    private static function getPattern($currency)
+    static private function getPattern($currency)
     {
         if (!$currency) {
             return '{{ widget }}';

+ 1 - 1
src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php

@@ -85,7 +85,7 @@ class DelegatingValidator implements FormValidatorInterface
      * @param FormInterface    $form    The validated form
      * @param ExecutionContext $context The current validation context
      */
-    public static function validateFormData(FormInterface $form, ExecutionContext $context)
+    static public function validateFormData(FormInterface $form, ExecutionContext $context)
     {
         if (is_object($form->getData()) || is_array($form->getData())) {
             $propertyPath = $context->getPropertyPath();

+ 4 - 4
src/Symfony/Component/Locale/Stub/StubIntl.php

@@ -68,7 +68,7 @@ abstract class StubIntl
      * @param  integer $errorCode The error code returned by StubIntl::getErrorCode()
      * @return Boolean
      */
-    public static function isFailure($errorCode) {
+    static public function isFailure($errorCode) {
         return in_array($errorCode, static::$errorCodes, true)
             && $errorCode !== self::U_ZERO_ERROR;
     }
@@ -80,7 +80,7 @@ abstract class StubIntl
      *
      * @return integer
      */
-    public static function getErrorCode() {
+    static public function getErrorCode() {
         return static::$errorCode;
     }
 
@@ -91,7 +91,7 @@ abstract class StubIntl
      *
      * @return string
      */
-    public static function getErrorMessage() {
+    static public function getErrorMessage() {
         return static::$errorMessages[static::$errorCode];
     }
 
@@ -102,7 +102,7 @@ abstract class StubIntl
      * @throws \InvalidArgumentException  If the code is not one of the error
      *                                    constants in this class
      */
-    public static function setErrorCode($code) {
+    static public function setErrorCode($code) {
         if (!isset(static::$errorMessages[$code])) {
             throw new \InvalidArgumentException(sprintf('No such error code: "%s"', $code));
         }

+ 1 - 1
src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php

@@ -52,7 +52,7 @@ final class ObjectIdentity implements ObjectIdentityInterface
      * @throws \InvalidArgumentException
      * @return ObjectIdentity
      */
-    public static function fromDomainObject($domainObject)
+    static public function fromDomainObject($domainObject)
     {
         if (!is_object($domainObject)) {
             throw new InvalidDomainObjectException('$domainObject must be an object.');

+ 2 - 2
src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php

@@ -50,7 +50,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface
      * @param UserInterface $user
      * @return UserSecurityIdentity
      */
-    public static function fromAccount(UserInterface $user)
+    static public 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
      */
-    public static function fromToken(TokenInterface $token)
+    static public function fromToken(TokenInterface $token)
     {
         $user = $token->getUser();
 

+ 1 - 1
src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php

@@ -176,7 +176,7 @@ class MaskBuilder
      * @throws \RuntimeException
      * @return string
      */
-    public static function getCode($mask)
+    static public function getCode($mask)
     {
         if (!is_int($mask)) {
             throw new \InvalidArgumentException('$mask must be an integer.');

+ 1 - 1
src/Symfony/Component/Validator/ValidatorFactory.php

@@ -97,7 +97,7 @@ class ValidatorFactory implements ValidatorContextInterface
      *                                      has neither the extension ".xml" nor
      *                                      ".yml" nor ".yaml"
      */
-    public static function buildDefault(array $mappingFiles = array(), $annotations = true, $staticMethod = null)
+    static public function buildDefault(array $mappingFiles = array(), $annotations = true, $staticMethod = null)
     {
         $xmlMappingFiles = array();
         $yamlMappingFiles = array();

+ 2 - 2
src/Symfony/Component/Yaml/Yaml.php

@@ -68,7 +68,7 @@ class Yaml
      *
      * @api
      */
-    public static function load($input)
+    static public function load($input)
     {
         $file = '';
 
@@ -113,7 +113,7 @@ class Yaml
      *
      * @api
      */
-    public static function dump($array, $inline = 2)
+    static public function dump($array, $inline = 2)
     {
         $yaml = new Dumper();