Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed CS

  • Loading branch information...
commit d100ffaf761b46acdb2440c04602378b87b0d610 1 parent d15faad
@fabpot fabpot authored
Showing with 806 additions and 882 deletions.
  1. +2 −2 src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityLoaderInterface.php
  2. +1 −1  src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
  3. +7 −7 src/Symfony/Bridge/Doctrine/RegistryInterface.php
  4. +1 −1  src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php
  5. +1 −1  src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIdentEntity.php
  6. +1 −1  src/Symfony/Bridge/Propel1/Tests/Form/PropelTypeGuesserTest.php
  7. +8 −8 src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
  8. +6 −6 src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
  9. +1 −2  src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinderInterface.php
  10. +1 −1  src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php
  11. +0 −1  src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
  12. +1 −1  src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
  13. +2 −2 src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
  14. +1 −1  src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_errors.html.php
  15. +0 −1  src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php
  16. +1 −1  src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php
  17. +1 −1  src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
  18. +7 −7 src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
  19. +0 −1  src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php
  20. +0 −1  src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
  21. +1 −1  src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php
  22. +0 −1  src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/deprecated_merge_full.php
  23. +0 −1  src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/deprecated_merge_partial.php
  24. +0 −1  src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
  25. +3 −3 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php
  26. +0 −1  src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml
  27. +1 −1  src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php
  28. +1 −1  src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/CodeHelperTest.php
  29. +2 −2 src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
  30. +1 −1  src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
  31. +1 −1  src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
  32. +4 −4 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php
  33. +3 −3 src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php
  34. +0 −1  src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
  35. +3 −3 src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php
  36. +1 −1  src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
  37. +1 −1  src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
  38. +1 −1  src/Symfony/Component/BrowserKit/Cookie.php
  39. +9 −9 src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
  40. +3 −3 src/Symfony/Component/ClassLoader/ClassMapGenerator.php
  41. +1 −1  src/Symfony/Component/ClassLoader/DebugClassLoader.php
  42. +1 −1  src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
  43. +8 −8 src/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php
  44. +0 −1  src/Symfony/Component/Config/Definition/ArrayNode.php
  45. +3 −3 src/Symfony/Component/Config/Definition/BaseNode.php
  46. +23 −23 src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php
  47. +2 −2 src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
  48. +3 −3 src/Symfony/Component/Config/Definition/Builder/ParentNodeDefinitionInterface.php
  49. +1 −1  src/Symfony/Component/Config/Definition/ConfigurationInterface.php
  50. +1 −1  src/Symfony/Component/Config/Definition/EnumNode.php
  51. +8 −8 src/Symfony/Component/Config/Definition/NodeInterface.php
  52. +2 −2 src/Symfony/Component/Config/Definition/Processor.php
  53. +1 −1  src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php
  54. +1 −1  src/Symfony/Component/Config/FileLocatorInterface.php
  55. +1 −1  src/Symfony/Component/Config/Loader/FileLoader.php
  56. +4 −4 src/Symfony/Component/Config/Loader/LoaderInterface.php
  57. +1 −1  src/Symfony/Component/Config/Loader/LoaderResolverInterface.php
  58. +3 −3 src/Symfony/Component/Config/Resource/ResourceInterface.php
  59. +0 −1  src/Symfony/Component/Config/Tests/Definition/BooleanNodeTest.php
  60. +1 −1  src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
  61. +3 −2 src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
  62. +1 −1  src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
  63. +1 −1  src/Symfony/Component/Console/Application.php
  64. +6 −6 src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
  65. +3 −3 src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
  66. +6 −6 src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php
  67. +3 −3 src/Symfony/Component/Console/Helper/HelperInterface.php
  68. +15 −15 src/Symfony/Component/Console/Input/InputInterface.php
  69. +8 −8 src/Symfony/Component/Console/Output/OutputInterface.php
  70. +2 −2 src/Symfony/Component/Console/Tests/ApplicationTest.php
  71. +2 −2 src/Symfony/Component/Console/Tests/Command/CommandTest.php
  72. +2 −3 src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
  73. +1 −1  src/Symfony/Component/CssSelector/CssSelector.php
  74. +1 −1  src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
  75. +1 −1  src/Symfony/Component/CssSelector/Node/FunctionNode.php
  76. +2 −2 src/Symfony/Component/CssSelector/Node/NodeInterface.php
  77. +1 −1  src/Symfony/Component/CssSelector/Node/PseudoNode.php
  78. +1 −1  src/Symfony/Component/CssSelector/XPathExpr.php
  79. +1 −1  src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php
  80. +0 −1  src/Symfony/Component/DependencyInjection/Compiler/LoggingFormatter.php
  81. +1 −1  src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php
  82. +2 −2 src/Symfony/Component/DependencyInjection/Container.php
  83. +1 −1  src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
  84. +1 −1  src/Symfony/Component/DependencyInjection/ContainerBuilder.php
  85. +11 −11 src/Symfony/Component/DependencyInjection/ContainerInterface.php
  86. +1 −1  src/Symfony/Component/DependencyInjection/Dumper/DumperInterface.php
  87. +1 −1  src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
  88. +1 −1  src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php
  89. +4 −4 src/Symfony/Component/DependencyInjection/Extension/ExtensionInterface.php
  90. +1 −1  src/Symfony/Component/DependencyInjection/IntrospectableContainerInterface.php
  91. +1 −1  src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
  92. +10 −10 src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
  93. +2 −2 src/Symfony/Component/DependencyInjection/ScopeInterface.php
  94. +1 −1  src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
  95. +1 −1  src/Symfony/Component/DependencyInjection/TaggedContainerInterface.php
  96. +0 −1  src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
  97. +2 −2 src/Symfony/Component/DependencyInjection/Tests/CrossCheckTest.php
  98. +2 −2 src/Symfony/Component/DependencyInjection/Tests/Dumper/GraphvizDumperTest.php
  99. +2 −2 src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
  100. +2 −2 src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
  101. +2 −2 src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
  102. +3 −3 src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
  103. +1 −1  src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo.php
  104. +2 −2 src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
  105. +2 −2 src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
  106. +2 −2 src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
  107. +1 −1  src/Symfony/Component/DomCrawler/Crawler.php
  108. +1 −1  src/Symfony/Component/DomCrawler/Form.php
  109. +2 −2 src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
  110. +7 −7 src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
  111. +1 −1  src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
  112. +3 −3 src/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php
  113. +0 −1  src/Symfony/Component/EventDispatcher/Tests/EventTest.php
  114. +3 −3 src/Symfony/Component/Finder/Finder.php
  115. +1 −1  src/Symfony/Component/Finder/Glob.php
  116. +0 −1  src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
  117. +2 −3 src/Symfony/Component/Finder/Tests/FinderTest.php
  118. +3 −3 src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
  119. +2 −2 src/Symfony/Component/Form/DataMapperInterface.php
  120. +2 −2 src/Symfony/Component/Form/DataTransformerInterface.php
  121. +1 −1  src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
  122. +8 −8 src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceListInterface.php
  123. +0 −1  src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
  124. +1 −0  src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
  125. +1 −1  src/Symfony/Component/Form/Extension/Core/EventListener/FixCheckboxInputListener.php
  126. +1 −1  src/Symfony/Component/Form/Extension/Core/EventListener/FixRadioInputListener.php
  127. +1 −1  src/Symfony/Component/Form/Extension/Core/EventListener/FixUrlProtocolListener.php
  128. +1 −1  src/Symfony/Component/Form/Extension/Core/EventListener/MergeCollectionListener.php
  129. +1 −1  src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
  130. +1 −1  src/Symfony/Component/Form/Extension/Core/EventListener/TrimListener.php
  131. +0 −1  src/Symfony/Component/Form/Extension/Core/Type/FormType.php
  132. +1 −1  src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
  133. +0 −1  src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
  134. +2 −2 src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
  135. +2 −2 src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderInterface.php
  136. +1 −1  src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
  137. +1 −1  src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php
  138. +0 −1  src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php
  139. +1 −1  src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
  140. +0 −2  src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
  141. +0 −1  src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPathIterator.php
  142. +0 −1  src/Symfony/Component/Form/Form.php
  143. +0 −1  src/Symfony/Component/Form/FormBuilder.php
  144. +11 −11 src/Symfony/Component/Form/FormBuilderInterface.php
  145. +2 −2 src/Symfony/Component/Form/FormConfig.php
  146. +21 −21 src/Symfony/Component/Form/FormConfigEditorInterface.php
  147. +24 −24 src/Symfony/Component/Form/FormConfigInterface.php
  148. +5 −5 src/Symfony/Component/Form/FormExtensionInterface.php
  149. +9 −9 src/Symfony/Component/Form/FormFactoryInterface.php
  150. +28 −28 src/Symfony/Component/Form/FormInterface.php
  151. +5 −5 src/Symfony/Component/Form/FormTypeExtensionInterface.php
  152. +5 −5 src/Symfony/Component/Form/FormTypeGuesserInterface.php
  153. +9 −9 src/Symfony/Component/Form/FormTypeInterface.php
  154. +1 −1  src/Symfony/Component/Form/FormValidatorInterface.php
  155. +16 −16 src/Symfony/Component/Form/FormViewInterface.php
  156. +1 −1  src/Symfony/Component/Form/Guess/Guess.php
  157. +0 −1  src/Symfony/Component/Form/Tests/AbstractFormTest.php
  158. +0 −1  src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
  159. +0 −6 src/Symfony/Component/Form/Tests/CompoundFormTest.php
  160. +0 −1  src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
  161. +6 −6 src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
  162. +0 −1  src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
  163. +0 −1  src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
  164. +0 −1  src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
  165. +6 −8 src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
  166. +0 −1  src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
  167. +0 −1  src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
  168. +0 −1  src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
  169. +6 −6 src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
  170. +0 −1  src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
  171. +0 −3  src/Symfony/Component/Form/Tests/Extension/Validator/EventListener/ValidationListenerTest.php
  172. +0 −1  src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
  173. +0 −1  src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
  174. +0 −4 src/Symfony/Component/Form/Tests/SimpleFormTest.php
  175. +1 −2  src/Symfony/Component/Form/UnmodifiableFormConfig.php
  176. +5 −5 src/Symfony/Component/Form/Util/FormUtil.php
  177. +8 −8 src/Symfony/Component/Form/Util/PropertyPathInterface.php
  178. +2 −2 src/Symfony/Component/Form/Util/PropertyPathIteratorInterface.php
  179. +2 −2 src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php
  180. +1 −1  src/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesserInterface.php
  181. +1 −1  src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
  182. +1 −1  src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
  183. +1 −1  src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php
  184. +2 −2 src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php
  185. +1 −1  src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php
  186. +1 −1  src/Symfony/Component/HttpFoundation/File/UploadedFile.php
  187. +1 −1  src/Symfony/Component/HttpFoundation/FileBag.php
  188. +1 −1  src/Symfony/Component/HttpFoundation/JsonResponse.php
  189. +1 −1  src/Symfony/Component/HttpFoundation/RedirectResponse.php
  190. +9 −8 src/Symfony/Component/HttpFoundation/Request.php
  191. +1 −1  src/Symfony/Component/HttpFoundation/RequestMatcherInterface.php
  192. +6 −6 src/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php
  193. +2 −2 src/Symfony/Component/HttpFoundation/Response.php
  194. +6 −6 src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBagInterface.php
  195. +2 −2 src/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php
  196. +9 −9 src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
  197. +4 −4 src/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php
  198. +19 −19 src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
  199. +1 −1  src/Symfony/Component/HttpFoundation/Session/Storage/Proxy/SessionHandlerProxy.php
  200. +12 −12 src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
  201. +0 −2  src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
  202. +0 −1  src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
  203. +0 −2  src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
  204. +0 −1  src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
  205. +0 −1  src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
  206. +0 −1  src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
  207. +8 −8 src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
  208. +1 −1  src/Symfony/Component/HttpKernel/CacheClearer/CacheClearerInterface.php
  209. +1 −1  src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerInterface.php
  210. +1 −1  src/Symfony/Component/HttpKernel/CacheWarmer/WarmableInterface.php
  211. +2 −2 src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
  212. +0 −1  src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
  213. +2 −2 src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterface.php
  214. +1 −1  src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
  215. +1 −1  src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php
  216. +1 −1  src/Symfony/Component/HttpKernel/DependencyInjection/ConfigurableExtension.php
  217. +1 −1  src/Symfony/Component/HttpKernel/DependencyInjection/Extension.php
  218. +1 −1  src/Symfony/Component/HttpKernel/EventListener/EsiListener.php
  219. +1 −1  src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
  220. +1 −1  src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
  221. +1 −1  src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
  222. +1 −1  src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
  223. +1 −2  src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
  224. +1 −1  src/Symfony/Component/HttpKernel/EventListener/StreamedResponseListener.php
  225. +1 −1  src/Symfony/Component/HttpKernel/Exception/FlattenException.php
  226. +2 −2 src/Symfony/Component/HttpKernel/Exception/HttpExceptionInterface.php
  227. +2 −2 src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php
  228. +7 −7 src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php
  229. +1 −1  src/Symfony/Component/HttpKernel/HttpKernelInterface.php
  230. +1 −1  src/Symfony/Component/HttpKernel/Kernel.php
  231. +17 −17 src/Symfony/Component/HttpKernel/KernelInterface.php
  232. +2 −2 src/Symfony/Component/HttpKernel/Log/DebugLoggerInterface.php
  233. +8 −8 src/Symfony/Component/HttpKernel/Log/LoggerInterface.php
  234. +1 −1  src/Symfony/Component/HttpKernel/Profiler/PdoProfilerStorage.php
  235. +4 −4 src/Symfony/Component/HttpKernel/Profiler/ProfilerStorageInterface.php
  236. +0 −1  src/Symfony/Component/HttpKernel/Profiler/SqliteProfilerStorage.php
  237. +1 −1  src/Symfony/Component/HttpKernel/TerminableInterface.php
  238. +1 −1  src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
  239. +2 −2 src/Symfony/Component/HttpKernel/Tests/Debug/ContainerAwareTraceableEventDispatcherTest.php
  240. +0 −1  src/Symfony/Component/HttpKernel/Tests/Debug/StopwatchTest.php
  241. +2 −2 src/Symfony/Component/HttpKernel/Tests/Fixtures/TestEventDispatcher.php
  242. +1 −1  src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php
  243. +1 −1  src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
  244. +2 −2 src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
  245. +2 −2 src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
  246. +9 −9 src/Symfony/Component/Locale/Locale.php
  247. +0 −1  src/Symfony/Component/Locale/Resources/data/update-data.php
  248. +4 −5 src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php
  249. +1 −1  src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php
  250. +1 −1  src/Symfony/Component/Locale/Stub/StubCollator.php
  251. +5 −5 src/Symfony/Component/Locale/Stub/StubIntl.php
  252. +1 −1  src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php
  253. +27 −27 src/Symfony/Component/Locale/Stub/StubLocale.php
  254. +7 −7 src/Symfony/Component/Locale/Stub/StubNumberFormatter.php
  255. +0 −1  src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
  256. +1 −1  src/Symfony/Component/OptionsResolver/Options.php
  257. +12 −12 src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
  258. +0 −1  src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php
  259. +1 −1  src/Symfony/Component/Process/Process.php
  260. +2 −2 src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php
  261. +1 −1  src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
  262. +1 −2  src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
  263. +2 −2 src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php
  264. +1 −1  src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php
  265. +1 −1  src/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php
  266. +2 −2 src/Symfony/Component/Routing/Matcher/UrlMatcher.php
  267. +1 −1  src/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php
  268. +2 −2 src/Symfony/Component/Routing/RequestContextAwareInterface.php
  269. +1 −1  src/Symfony/Component/Routing/Route.php
  270. +1 −1  src/Symfony/Component/Routing/RouteCompilerInterface.php
  271. +1 −1  src/Symfony/Component/Routing/RouterInterface.php
  272. +0 −1  src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
  273. +0 −1  src/Symfony/Component/Routing/Tests/Fixtures/validpattern.yml
  274. +0 −1  src/Symfony/Component/Routing/Tests/Loader/AbstractAnnotationLoaderTest.php
  275. +0 −1  src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
  276. +0 −1  src/Symfony/Component/Routing/Tests/Matcher/ApacheUrlMatcherTest.php
  277. +2 −2 src/Symfony/Component/Routing/Tests/Matcher/Dumper/ApacheMatcherDumperTest.php
  278. +0 −1  src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
  279. +1 −1  src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
  280. +0 −1  src/Symfony/Component/Security/Acl/Domain/Acl.php
  281. +1 −1  src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php
  282. +2 −2 src/Symfony/Component/Security/Acl/Domain/UserSecurityIdentity.php
  283. +6 −6 src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php
  284. +10 −10 src/Symfony/Component/Security/Acl/Model/AclInterface.php
  285. +3 −3 src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php
  286. +1 −1  src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php
  287. +4 −4 src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php
  288. +2 −2 src/Symfony/Component/Security/Acl/Model/AuditableEntryInterface.php
  289. +1 −1  src/Symfony/Component/Security/Acl/Model/DomainObjectInterface.php
  290. +6 −6 src/Symfony/Component/Security/Acl/Model/EntryInterface.php
  291. +1 −1  src/Symfony/Component/Security/Acl/Model/FieldEntryInterface.php
  292. +15 −15 src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php
  293. +3 −3 src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php
  294. +3 −3 src/Symfony/Component/Security/Acl/Model/ObjectIdentityInterface.php
  295. +1 −1  src/Symfony/Component/Security/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php
  296. +2 −2 src/Symfony/Component/Security/Acl/Model/PermissionGrantingStrategyInterface.php
  297. +1 −1  src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php
  298. +1 −1  src/Symfony/Component/Security/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php
  299. +1 −1  src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php
  300. +2 −2 src/Symfony/Component/Security/Acl/Permission/PermissionMapInterface.php
Sorry, we could not display the entire diff because too many files (393) changed.
View
4 src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityLoaderInterface.php
@@ -23,7 +23,7 @@
*
* @return array The entities.
*/
- function getEntities();
+ public function getEntities();
/**
* Returns an array of entities matching the given identifiers.
@@ -35,5 +35,5 @@ function getEntities();
*
* @return array The entities.
*/
- function getEntitiesByIds($identifier, array $values);
+ public function getEntitiesByIds($identifier, array $values);
}
View
2  src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
@@ -26,7 +26,7 @@
*/
class MergeDoctrineCollectionListener implements EventSubscriberInterface
{
- static public function getSubscribedEvents()
+ public static function getSubscribedEvents()
{
// Higher priority than core MergeCollectionListener so that this one
// is called before
View
14 src/Symfony/Bridge/Doctrine/RegistryInterface.php
@@ -26,7 +26,7 @@
*
* @return string The default entity manager name
*/
- function getDefaultEntityManagerName();
+ public function getDefaultEntityManagerName();
/**
* Gets a named entity manager.
@@ -35,14 +35,14 @@ function getDefaultEntityManagerName();
*
* @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.
@@ -61,7 +61,7 @@ function getEntityManagers();
*
* @return EntityManager
*/
- function resetEntityManager($name = null);
+ public function resetEntityManager($name = null);
/**
* Resolves a registered namespace alias to the full namespace.
@@ -74,14 +74,14 @@ function resetEntityManager($name = null);
*
* @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 entity manager associated with a given class.
@@ -90,5 +90,5 @@ function getEntityManagerNames();
*
* @return EntityManager|null
*/
- function getEntityManagerForClass($class);
+ public function getEntityManagerForClass($class);
}
View
2  src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php
@@ -35,7 +35,7 @@ protected function setUp()
/**
* @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');
View
2  src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIdentEntity.php
@@ -32,6 +32,6 @@ public function __construct($id, $name)
public function __toString()
{
- return (string)$this->name;
+ return (string) $this->name;
}
}
View
2  src/Symfony/Bridge/Propel1/Tests/Form/PropelTypeGuesserTest.php
@@ -105,7 +105,7 @@ public function testGuessType($property, $type, $confidence)
$this->assertEquals($confidence, $value->getConfidence());
}
- static public function dataProviderForGuessType()
+ public static function dataProviderForGuessType()
{
return array(
array('is_active', 'checkbox', Guess::HIGH_CONFIDENCE),
View
16 src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -98,32 +98,32 @@ public function testThemeBlockInheritanceUsingExtend()
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)
@@ -131,14 +131,14 @@ protected function setTheme(FormView $view, array $themes)
$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'))
View
12 src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -68,32 +68,32 @@ protected function tearDown()
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)
View
3  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 @@
*
* @return array An array of templates of type TemplateReferenceInterface
*/
- function findAllTemplates();
+ public function findAllTemplates();
}
View
2  src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php
@@ -24,7 +24,7 @@ public function process(ContainerBuilder $container)
$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');
View
1  src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -11,7 +11,6 @@
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
-use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\DefinitionDecorator;
use Symfony\Component\DependencyInjection\Reference;
View
2  src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
@@ -52,7 +52,7 @@ public function onKernelRequest(GetResponseEvent $event)
$request->setSession($this->container->get('session'));
}
- static public function getSubscribedEvents()
+ public static function getSubscribedEvents()
{
return array(
KernelEvents::REQUEST => array('onKernelRequest', 128),
View
4 src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
@@ -49,7 +49,7 @@ public function onKernelRequest(GetResponseEvent $event)
$session = $this->container->get('session');
$cookies = $event->getRequest()->cookies;
-
+
if ($cookies->has($session->getName())) {
$session->setId($cookies->get($session->getName()));
} else {
@@ -78,7 +78,7 @@ public function onKernelResponse(FilterResponseEvent $event)
}
}
- static public function getSubscribedEvents()
+ public static function getSubscribedEvents()
{
return array(
KernelEvents::REQUEST => array('onKernelRequest', 192),
View
2  src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_errors.html.php
@@ -48,4 +48,4 @@
</td>
</tr>
<?php endif; ?>
-<?php endif; ?>
+<?php endif;
View
1  src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/hidden_row.html.php
@@ -3,4 +3,3 @@
<?php echo $view['form']->widget($form) ?>
</td>
</tr>
-
View
2  src/Symfony/Bundle/FrameworkBundle/Templating/EngineInterface.php
@@ -30,5 +30,5 @@
*
* @return Response A Response instance
*/
- function renderResponse($view, array $parameters = array(), Response $response = null);
+ public function renderResponse($view, array $parameters = array(), Response $response = null);
}
View
2  src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
@@ -201,7 +201,7 @@ public function getName()
return 'code';
}
- static protected function fixCodeMarkup($line)
+ protected static function fixCodeMarkup($line)
{
// </span> ending tag from previous line
$opening = strpos($line, '<span');
View
14 src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -22,8 +22,8 @@
*/
abstract class WebTestCase extends \PHPUnit_Framework_TestCase
{
- static protected $class;
- static protected $kernel;
+ protected static $class;
+ protected static $kernel;
/**
* Creates a Client.
@@ -33,7 +33,7 @@
*
* @return Client A Client instance
*/
- static protected function createClient(array $options = array(), array $server = array())
+ protected static function createClient(array $options = array(), array $server = array())
{
if (null !== static::$kernel) {
static::$kernel->shutdown();
@@ -56,7 +56,7 @@ static protected function createClient(array $options = array(), array $server =
*
* @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.');
@@ -89,7 +89,7 @@ static protected function getPhpUnitXmlDir()
*
* @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']);
@@ -114,7 +114,7 @@ static private function getPhpUnitCliConfigArgument()
*
* @return string The Kernel class name
*/
- static protected function getKernelClass()
+ protected static function getKernelClass()
{
$dir = isset($_SERVER['KERNEL_DIR']) ? $_SERVER['KERNEL_DIR'] : static::getPhpUnitXmlDir();
@@ -145,7 +145,7 @@ static protected function getKernelClass()
*
* @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();
View
1  src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php
@@ -16,7 +16,6 @@
use Symfony\Bundle\FrameworkBundle\CacheWarmer\TemplateFinder;
use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BaseBundle\BaseBundle;
-
class TemplateFinderTest extends TestCase
{
public function testFindAllTemplates()
View
1  src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -68,7 +68,6 @@ public function testRoute($permanent, $expectedCode)
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-
$container
->expects($this->at(0))
->method('get')
View
2  ...le/FrameworkBundle/Tests/DependencyInjection/Compiler/RegisterKernelListenersPassTest.php
@@ -85,5 +85,5 @@ public function testValidEventSubscriber()
class SubscriberService implements \Symfony\Component\EventDispatcher\EventSubscriberInterface
{
- static function getSubscribedEvents() {}
+ public static function getSubscribedEvents() {}
}
View
1  ...y/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/deprecated_merge_full.php
@@ -18,4 +18,3 @@
'cookie_httponly' => true,
),
));
-
View
1  ...undle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/deprecated_merge_partial.php
@@ -15,4 +15,3 @@
'cookie_httponly' => true,
),
));
-
View
1  ...ny/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}
-
View
6 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php
@@ -17,7 +17,7 @@
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 @@ protected function deleteTmpDir($testCase)
$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();
View
1  src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/config.yml
@@ -1,3 +1,2 @@
imports:
- { resource: ./../config/default.yml }
-
View
2  src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php
@@ -48,7 +48,7 @@ public function testHandle($type)
$resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
$kernel = new HttpKernel($dispatcher, $container, $resolver);
- $controller = function() use($expected) {
+ $controller = function() use ($expected) {
return $expected;
};
View
2  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');
}
View
4 src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -82,14 +82,14 @@ protected function setTheme(FormView $view, array $themes)
$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'))
View
2  src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -277,7 +277,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
->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;
View
2  src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -80,7 +80,7 @@ public function addConfiguration(NodeDefinition $node)
}
}
- public final function addOption($name, $default = null)
+ final public function addOption($name, $default = null)
{
$this->options[$name] = $default;
}
View
8 ...y/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php
@@ -21,11 +21,11 @@
*/
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);
}
View
6 ...SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php
@@ -22,9 +22,9 @@
*/
interface UserProviderFactoryInterface
{
- function create(ContainerBuilder $container, $id, $config);
+ public function create(ContainerBuilder $container, $id, $config);
- function getKey();
+ public function getKey();
- function addConfiguration(NodeDefinition $builder);
+ public function addConfiguration(NodeDefinition $builder);
}
View
1  src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -625,4 +625,3 @@ public function getConfiguration(array $config, ContainerBuilder $container)
return new MainConfiguration($this->factories, $this->userProviderFactories);
}
}
-
View
6 src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php
@@ -17,7 +17,7 @@
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: '.substr($response, 0, 2000));
self::assertEquals('http://localhost'.$location, $response->headers->get('Location'));
@@ -42,14 +42,14 @@ protected function deleteTmpDir($testCase)
$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();
View
2  src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_style.html.twig
@@ -55,7 +55,7 @@
.sf-toolbar-block .sf-toolbar-info-piece:last-child {
padding-bottom: 0;
}
-
+
.sf-toolbar-block .sf-toolbar-info-piece a,
.sf-toolbar-block .sf-toolbar-info-piece abbr {
color: #2f2f2f;
View
2  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) {
View
2  src/Symfony/Component/BrowserKit/Cookie.php
@@ -117,7 +117,7 @@ public function __toString()
*
* @api
*/
- static public function fromString($cookie, $url = null)
+ public static function fromString($cookie, $url = null)
{
$parts = explode(';', $cookie);
View
18 src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -18,8 +18,8 @@
*/
class ClassCollectionLoader
{
- static private $loaded;
- static private $seen;
+ private static $loaded;
+ private static $seen;
/**
* Loads a list of classes and caches them in one big file.
@@ -33,7 +33,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])) {
@@ -133,7 +133,7 @@ static public function load($classes, $cacheDir, $name, $autoReload, $adaptive =
*
* @return string Namespaces with brackets
*/
- static public function fixNamespaceDeclarations($source)
+ public static function fixNamespaceDeclarations($source)
{
if (!function_exists('token_get_all')) {
return $source;
@@ -188,7 +188,7 @@ static public function fixNamespaceDeclarations($source)
*
* @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)) {
@@ -210,7 +210,7 @@ static private function writeCacheFile($file, $content)
*
* @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;
@@ -240,7 +240,7 @@ static private function stripComments($source)
*
* @throws \InvalidArgumentException When a class can't be loaded
*/
- static private function getOrderedClasses(array $classes)
+ private static function getOrderedClasses(array $classes)
{
$map = array();
self::$seen = array();
@@ -257,7 +257,7 @@ static private function getOrderedClasses(array $classes)
return $map;
}
- static private function getClassHierarchy(\ReflectionClass $class)
+ private static function getClassHierarchy(\ReflectionClass $class)
{
if (isset(self::$seen[$class->getName()])) {
return array();
@@ -294,7 +294,7 @@ static private function getClassHierarchy(\ReflectionClass $class)
return $classes;
}
- static private function getTraits(\ReflectionClass $class)
+ private static function getTraits(\ReflectionClass $class)
{
$traits = $class->getTraits();
$classes = array();
View
6 src/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -24,7 +24,7 @@ class ClassMapGenerator
* @param array|string $dirs Directories or a single path to search in
* @param string $file The name of the class map file
*/
- static public function dump($dirs, $file)
+ public static function dump($dirs, $file)
{
$dirs = (array) $dirs;
$maps = array();
@@ -43,7 +43,7 @@ static public function dump($dirs, $file)
*
* @return array A class map array
*/
- static public function createMap($dir)
+ public static function createMap($dir)
{
if (is_string($dir)) {
$dir = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir));
@@ -80,7 +80,7 @@ static public function createMap($dir)
*
* @return array The found classes
*/
- static private function findClasses($path)
+ private static function findClasses($path)
{
$contents = file_get_contents($path);
$tokens = token_get_all($contents);
View
2  src/Symfony/Component/ClassLoader/DebugClassLoader.php
@@ -42,7 +42,7 @@ public function __construct($classFinder)
/**
* Replaces all autoloaders implementing a findFile method by a DebugClassLoader wrapper.
*/
- static public function enable()
+ public static function enable()
{
if (!is_array($functions = spl_autoload_functions())) {
return;
View
2  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;
View
16 src/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php
@@ -1,7 +1,7 @@
<?php
namespace {
- trait TFoo {
-
+ trait TFoo
+ {
}
class CFoo
@@ -11,16 +11,16 @@ class CFoo
}
namespace Foo {
- trait TBar {
-
+ trait TBar
+ {
}
- interface IBar {
-
+ interface IBar
+ {
}
- trait TFooBar {
-
+ trait TFooBar
+ {
}
class CBar implements IBar
View
1  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;
View
6 src/Symfony/Component/Config/Definition/BaseNode.php
@@ -221,7 +221,7 @@ public function getPath()
*
* @throws ForbiddenOverwriteException
*/
- public final function merge($leftSide, $rightSide)
+ final public function merge($leftSide, $rightSide)
{
if (!$this->allowOverwrite) {
throw new ForbiddenOverwriteException(sprintf(
@@ -245,7 +245,7 @@ public function getPath()
*
* @return mixed The normalized value.
*/
- public final function normalize($value)
+ final public function normalize($value)
{
// run custom normalization closures
foreach ($this->normalizationClosures as $closure) {
@@ -273,7 +273,7 @@ public function getPath()
*
* @return mixed The finalized value
*/
- public final function finalize($value)
+ final public function finalize($value)
{
$this->validateType($value);
View
46 src/Symfony/Component/Config/Definition/Builder/EnumNodeDefinition.php
@@ -12,30 +12,30 @@
*/
class EnumNodeDefinition extends ScalarNodeDefinition
{
- private $values;
-
- public function values(array $values)
- {
- $values = array_unique($values);
-
- if (count($values) <= 1) {
- throw new \InvalidArgumentException('->values() must be called with at least two distinct values.');
- }
-
- $this->values = $values;
- }
-
- /**
- * Instantiate a Node
- *
- * @return EnumNode The node
- */
- protected function instantiateNode()
+ private $values;
+
+ public function values(array $values)
+ {
+ $values = array_unique($values);
+
+ if (count($values) <= 1) {
+ throw new \InvalidArgumentException('->values() must be called with at least two distinct values.');
+ }
+
+ $this->values = $values;
+ }
+
+ /**
+ * Instantiate a Node
+ *
+ * @return EnumNode The node
+ */
+ protected function instantiateNode()
{
if (null === $this->values) {
throw new \RuntimeException('You must call ->values() on enum nodes.');
}
-
- return new EnumNode($this->name, $this->parent, $this->values);
- }
-}
+
+ return new EnumNode($this->name, $this->parent, $this->values);
+ }
+}
View
4 src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -214,11 +214,11 @@ public function end()
*
* @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;
};
}
View
6 src/Symfony/Component/Config/Definition/Builder/ParentNodeDefinitionInterface.php
@@ -18,9 +18,9 @@
*/
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);
}
View
2  src/Symfony/Component/Config/Definition/ConfigurationInterface.php
@@ -23,5 +23,5 @@
*
* @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder
*/
- function getConfigTreeBuilder();
+ public function getConfigTreeBuilder();
}
View
2  src/Symfony/Component/Config/Definition/EnumNode.php
@@ -47,4 +47,4 @@ protected function finalizeValue($value)
return $value;
}
-}
+}
View
16 src/Symfony/Component/Config/Definition/NodeInterface.php
@@ -26,28 +26,28 @@
*
* @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 @@ function hasDefaultValue();
* @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 @@ function getDefaultValue();
*
* @return mixed The normalized value
*/
- function normalize($value);
+ public function normalize($value);
/**
* Merges two values together.
@@ -74,7 +74,7 @@ function normalize($value);
*
* @return mixed The merged values
*/
- function merge($leftSide, $rightSide);
+ public function merge($leftSide, $rightSide);
/**
* Finalizes a value.
@@ -83,5 +83,5 @@ function merge($leftSide, $rightSide);
*
* @return mixed The finalized value
*/
- function finalize($value);
+ public function finalize($value);
}
View
4 src/Symfony/Component/Config/Definition/Processor.php
@@ -65,7 +65,7 @@ public function processConfiguration(ConfigurationInterface $configuration, arra
*
* @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 @@ static public function normalizeKeys(array $config)
*
* @return array
*/
- static public function normalizeConfig($config, $key, $plural = null)
+ public static function normalizeConfig($config, $key, $plural = null)
{
if (null === $plural) {
$plural = $key.'s';
View
2  src/Symfony/Component/Config/Definition/PrototypeNodeInterface.php
@@ -23,5 +23,5 @@
*
* @param string $name The name of the node
*/
- function setName($name);
+ public function setName($name);
}
View
2  src/Symfony/Component/Config/FileLocatorInterface.php
@@ -27,5 +27,5 @@
*
* @throws \InvalidArgumentException When file is not found
*/
- function locate($name, $currentPath = null, $first = true);
+ public function locate($name, $currentPath = null, $first = true);
}
View
2  src/Symfony/Component/Config/Loader/FileLoader.php
@@ -22,7 +22,7 @@
*/
abstract class FileLoader extends Loader
{
- static protected $loading = array();
+ protected static $loading = array();
protected $locator;
View
8 src/Symfony/Component/Config/Loader/LoaderInterface.php
@@ -24,7 +24,7 @@
* @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 @@ function load($resource, $type = null);
*
* @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 LoaderResolverInterface A LoaderResolverInterface instance
*/
- function getResolver();
+ public function getResolver();
/**
* Sets the loader resolver.
*
* @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
*/
- function setResolver(LoaderResolverInterface $resolver);
+ public function setResolver(LoaderResolverInterface $resolver);
}
View
2  src/Symfony/Component/Config/Loader/LoaderResolverInterface.php
@@ -26,5 +26,5 @@
*
* @return LoaderInterface A LoaderInterface instance
*/
- function resolve($resource, $type = null);
+ public function resolve($resource, $type = null);
}
View
6 src/Symfony/Component/Config/Resource/ResourceInterface.php
@@ -23,7 +23,7 @@
*
* @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 @@ function __toString();
*
* @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();
}
View
1  src/Symfony/Component/Config/Tests/Definition/BooleanNodeTest.php
@@ -58,4 +58,3 @@ public function getInvalidValues()
);
}
}
-
View
2  src/Symfony/Component/Config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
@@ -34,4 +34,4 @@ public function testGetNode()
$node = $def->getNode();
$this->assertEquals(array('foo', 'bar'), $node->getValues());
}
-}
+}
View
5 src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php
@@ -13,7 +13,6 @@
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-
class ExprBuilderTest extends \PHPUnit_Framework_TestCase
{
@@ -160,6 +159,7 @@ public function testThenUnsetExpression()
protected function getTestBuilder()
{
$builder = new TreeBuilder();
+
return $builder
->root('test')
->children()
@@ -191,7 +191,8 @@ protected function finalizeTestBuilder($testBuilder, $config=null)
* @param $val The value that the closure must return
* @return Closure
*/
- protected function returnClosure($val) {
+ protected function returnClosure($val)
+ {
return function($v) use ($val) {
return $val;
};
View
2  src/Symfony/Component/Config/Tests/Definition/EnumNodeTest.php
@@ -38,4 +38,4 @@ public function testFinalizeWithInvalidValue()
$node = new EnumNode('foo', null, array('foo', 'bar'));
$node->finalize('foobar');
}
-}
+}
View
2  src/Symfony/Component/Console/Application.php
@@ -619,7 +619,7 @@ public function all($namespace = null)
*
* @return array An array of abbreviations
*/
- static public function getAbbreviations($names)
+ public static function getAbbreviations($names)
{
$abbrevs = array();
foreach ($names as $name) {
View
12 src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php
@@ -27,7 +27,7 @@
*
* @api
*/
- function setDecorated($decorated);
+ public function setDecorated($decorated);
/**
* Gets the decorated flag.
@@ -36,7 +36,7 @@ function setDecorated($decorated);
*
* @api
*/
- function isDecorated();
+ public function isDecorated();
/**
* Sets a new style.
@@ -46,7 +46,7 @@ function isDecorated();
*
* @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 @@ function setStyle($name, OutputFormatterStyleInterface $style);
*
* @api
*/
- function hasStyle($name);
+ public function hasStyle($name);
/**
* Gets style options from style with specified name.
@@ -68,7 +68,7 @@ function hasStyle($name);
*
* @api
*/
- function getStyle($name);
+ public function getStyle($name);
/**
* Formats a message according to the given styles.
@@ -79,5 +79,5 @@ function getStyle($name);
*
* @api
*/
- function format($message);
+ public function format($message);
}
View
6 src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
@@ -20,7 +20,7 @@
*/
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,
View
12 src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php
@@ -27,7 +27,7 @@
*
* @api
*/
- function setForeground($color = null);
+ public function setForeground($color = null);
/**
* Sets style background color.
@@ -36,7 +36,7 @@ function setForeground($color = null);
*
* @api
*/
- function setBackground($color = null);
+ public function setBackground($color = null);
/**
* Sets some specific style option.
@@ -45,21 +45,21 @@ function setBackground($color = null);
*
* @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 @@ function setOptions(array $options);
*
* @return string
*/
- function apply($text);
+ public function apply($text);
}
View
6 src/Symfony/Component/Console/Helper/HelperInterface.php
@@ -27,7 +27,7 @@
*
* @api
*/
- function setHelperSet(HelperSet $helperSet = null);
+ public function setHelperSet(HelperSet $helperSet = null);
/**
* Gets the helper set associated with this helper.
@@ -36,7 +36,7 @@ function setHelperSet(HelperSet $helperSet = null);
*
* @api
*/
- function getHelperSet();
+ public function getHelperSet();
/**
* Returns the canonical name of this helper.
@@ -45,5 +45,5 @@ function getHelperSet();
*
* @api
*/
- function getName();
+ public function getName();
}
View
30 src/Symfony/Component/Console/Input/InputInterface.php
@@ -23,7 +23,7 @@
*
* @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 @@ function getFirstArgument();
*
* @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 @@ function hasParameterOption($values);
*
* @return mixed The option value