Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated vendors

  • Loading branch information...
commit 3fdce7f6944ed3b798332dfcc9d8caef5539e890 1 parent 22cd0d6
@fabpot fabpot authored
Showing with 3,574 additions and 2,285 deletions.
  1. +1 −1  LICENSE
  2. 0  bin/{create_sandbox.sh → build.sh}
  3. +0 −4 bin/prepare.sh
  4. +15 −12 bin/vendors.sh
  5. +2 −1  vendor/assetic/phpunit.xml.dist
  6. +4 −0 vendor/assetic/src/Assetic/Cache/FilesystemCache.php
  7. +11 −6 vendor/assetic/src/Assetic/Filter/CoffeeScriptFilter.php
  8. +8 −5 vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php
  9. +67 −17 vendor/assetic/src/Assetic/Filter/LessFilter.php
  10. +279 −0 vendor/assetic/src/Assetic/Filter/Process.php
  11. +9 −4 vendor/assetic/src/Assetic/Filter/Sass/SassFilter.php
  12. +8 −4 vendor/assetic/src/Assetic/Filter/SprocketsFilter.php
  13. +8 −5 vendor/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php
  14. +57 −27 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/AbstractMigration.php
  15. +19 −14 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Configuration/AbstractFileConfiguration.php
  16. +88 −59 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Configuration/Configuration.php
  17. +2 −5 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Configuration/XmlConfiguration.php
  18. +2 −5 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Configuration/YamlConfiguration.php
  19. +0 −3  vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/IrreversibleMigrationException.php
  20. +25 −22 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Migration.php
  21. +0 −3  vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/MigrationException.php
  22. +3 −6 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/OutputWriter.php
  23. +14 −9 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/AbstractCommand.php
  24. +5 −8 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/DiffCommand.php
  25. +1 −4 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/ExecuteCommand.php
  26. +24 −22 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/GenerateCommand.php
  27. +2 −5 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/MigrateCommand.php
  28. +1 −4 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/StatusCommand.php
  29. +1 −4 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/VersionCommand.php
  30. +80 −73 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Version.php
  31. +18 −0 vendor/doctrine-migrations/phpunit.xml.dist
  32. +81 −7 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Configuration.php
  33. +35 −33 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/DocumentManager.php
  34. +3 −1 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/DocumentRepository.php
  35. +1 −1  vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Id/IncrementGenerator.php
  36. +21 −0 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
  37. +5 −2 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataFactory.php
  38. +37 −22 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php
  39. +6 −3 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AnnotationDriver.php
  40. +5 −1 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Mapping/Driver/DoctrineAnnotations.php
  41. +3 −0  vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php
  42. +3 −0  vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Mapping/Driver/YamlDriver.php
  43. +2 −1  vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Query/Builder.php
  44. +42 −6 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/SchemaManager.php
  45. +2 −2 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/CreateCommand.php
  46. +2 −2 vendor/doctrine-mongodb-odm/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/DropCommand.php
  47. +1 −1  vendor/symfony/LICENSE
  48. +1 −1  vendor/symfony/src/Symfony/Bundle/AsseticBundle/CacheWarmer/TwigAssetsCacheWarmer.php
  49. +12 −3 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Controller/{Controller.php → AsseticController.php}
  50. +18 −31 vendor/symfony/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php
  51. +6 −2 vendor/symfony/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/FilterManagerPass.php
  52. +48 −0 vendor/symfony/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Configuration.php
  53. +4 −4 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Factory/AssetFactory.php
  54. +60 −0 vendor/symfony/src/Symfony/Bundle/AsseticBundle/LazyFilterManager.php
  55. +18 −17 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Resources/config/assetic.xml
  56. +7 −1 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Resources/config/controller.xml
  57. +7 −5 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Resources/config/google_closure_compiler.xml
  58. +1 −2  vendor/symfony/src/Symfony/Bundle/AsseticBundle/Resources/config/yui_compressor.xml
  59. +5 −5 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/CacheWarmer/TwigAssetsCacheWarmerTest.php
  60. +27 −15 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/DependencyInjection/AsseticExtensionTest.php
  61. +1 −1  vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/{ → Factory}/CachedAssetManagerTest.php
  62. +3 −3 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/FunctionalTest.php
  63. +22 −0 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/Kernel/TestBundle.php
  64. +1 −0  vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/Kernel/TestKernel.php
  65. +1 −0  vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/Kernel/bundle/Resources/css/bundle.css
  66. +1 −1  vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/Kernel/views/layout.html.php
  67. +1 −1  vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/Kernel/views/layout.html.twig
  68. +64 −0 vendor/symfony/src/Symfony/Bundle/AsseticBundle/Tests/LazyFilterManagerTest.php
  69. +0 −28 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Resources/config/assets.xml
  70. +0 −104 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Templating/Helper/JavascriptsHelper.php
  71. +0 −104 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Templating/Helper/StylesheetsHelper.php
  72. +0 −74 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Twig/Extension/AssetsExtension.php
  73. +0 −42 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Twig/Node/JavascriptNode.php
  74. +0 −38 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Twig/Node/JavascriptsNode.php
  75. +0 −42 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Twig/Node/StylesheetNode.php
  76. +0 −38 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Twig/Node/StylesheetsNode.php
  77. +0 −57 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Twig/TokenParser/JavascriptTokenParser.php
  78. +0 −46 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Twig/TokenParser/JavascriptsTokenParser.php
  79. +0 −57 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Twig/TokenParser/StylesheetTokenParser.php
  80. +0 −46 vendor/symfony/src/Symfony/Bundle/CompatAssetsBundle/Twig/TokenParser/StylesheetsTokenParser.php
  81. +0 −8 vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
  82. +2 −2 vendor/symfony/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsDiffDoctrineCommand.php
  83. +2 −2 vendor/symfony/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsExecuteDoctrineCommand.php
  84. +2 −2 vendor/symfony/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsGenerateDoctrineCommand.php
  85. +2 −2 vendor/symfony/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsMigrateDoctrineCommand.php
  86. +2 −2 vendor/symfony/src/Symfony/Bundle/DoctrineMigrationsBundle/Command/MigrationsStatusDoctrineCommand.php
  87. +0 −1  vendor/symfony/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
  88. +13 −20 ...symfony/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
  89. +1 −3 ...octrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_multiple_connections.xml
  90. +0 −1  ...octrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/yml/mongodb_service_multiple_connections.yml
  91. +1 −1  vendor/symfony/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/TestCase.php
  92. +5 −18 vendor/symfony/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php
  93. +4 −3 vendor/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
  94. +1 −1  vendor/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
  95. +7 −6 vendor/symfony/src/Symfony/{Component/HttpKernel → Bundle/FrameworkBundle}/Profiler/ProfilerListener.php
  96. +1 −2  vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
  97. +3 −3 vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml
  98. +1 −1  vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/error.json.twig
  99. +2 −2 vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
  100. +23 −17 vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Configuration.php
  101. +1 −1  vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
  102. +26 −0 vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php
  103. +1 −1  vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
  104. +1 −1  vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php
  105. +1 −1  vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
  106. +1 −1  ...symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php
  107. +1 −1  vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php
  108. +62 −48 vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
  109. +16 −1 vendor/symfony/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
  110. +15 −13 vendor/symfony/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml
  111. +53 −0 vendor/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/ConfigurationTest.php
  112. +3 −0  vendor/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php
  113. +2 −0  vendor/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml
  114. +3 −1 vendor/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml
  115. +18 −10 vendor/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
  116. +64 −0 vendor/symfony/src/Symfony/Bundle/SwiftmailerBundle/Command/SendEmailCommand.php
  117. +72 −0 vendor/symfony/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/Configuration.php
  118. +25 −42 vendor/symfony/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
  119. +1 −10 vendor/symfony/src/Symfony/Bundle/SwiftmailerBundle/Resources/config/swiftmailer.xml
  120. +15 −1 vendor/symfony/src/Symfony/Bundle/SwiftmailerBundle/Tests/DependencyInjection/SwiftmailerExtensionTest.php
  121. +122 −0 vendor/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
  122. +43 −75 vendor/symfony/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
  123. +42 −0 vendor/symfony/src/Symfony/Bundle/TwigBundle/GlobalVariables.php
  124. +12 −6 vendor/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/schema/twig-1.0.xsd
  125. +0 −8 vendor/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
  126. +7 −8 vendor/symfony/src/Symfony/Bundle/TwigBundle/Resources/views/form.html.twig
  127. +25 −0 vendor/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
  128. +18 −0 vendor/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
  129. +18 −0 vendor/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
  130. +105 −51 vendor/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
  131. +20 −9 vendor/symfony/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
  132. +1 −1  vendor/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
  133. +1 −1  vendor/symfony/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
  134. +1 −1  vendor/symfony/src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php
  135. +9 −10 vendor/symfony/src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php
  136. +1 −1  vendor/symfony/src/Symfony/Component/BrowserKit/Client.php
  137. +58 −8 ...or/symfony/src/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/ArrayNode.php
  138. +14 −4 vendor/symfony/src/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/BaseNode.php
  139. +11 −2 .../symfony/src/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/BooleanNode.php
  140. +201 −0 vendor/symfony/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
  141. +14 −5 ...src/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/Builder/MergeBuilder.php
  142. +129 −29 .../src/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/Builder/NodeBuilder.php
  143. +13 −4 ...ony/Component/{DependencyInjection/Configuration → Config/Definition}/Builder/NormalizationBuilder.php
  144. +34 −12 .../src/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/Builder/TreeBuilder.php
  145. +53 −0 vendor/symfony/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
  146. +22 −0 vendor/symfony/src/Symfony/Component/Config/Definition/Exception/DuplicateKeyException.php
  147. +5 −7 ...undle/CompatAssetsBundle/CompatAssetsBundle.php → Component/Config/Definition/Exception/Exception.php}
  148. +22 −0 vendor/symfony/src/Symfony/Component/Config/Definition/Exception/ForbiddenOverwriteException.php
  149. +22 −0 vendor/symfony/src/Symfony/Component/Config/Definition/Exception/InvalidConfigurationException.php
  150. +21 −0 vendor/symfony/src/Symfony/Component/Config/Definition/Exception/InvalidTypeException.php
  151. +22 −0 vendor/symfony/src/Symfony/Component/Config/Definition/Exception/UnsetKeyException.php
  152. +10 −1 ...ymfony/src/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/NodeInterface.php
  153. +10 −1 ...or/symfony/src/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/Processor.php
  154. +10 −1 ...c/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/PrototypeNodeInterface.php
  155. +12 −3 ...r/symfony/src/Symfony/Component/{DependencyInjection/Configuration → Config/Definition}/ScalarNode.php
  156. +0 −123 vendor/symfony/src/Symfony/Component/DependencyInjection/Configuration/Builder/ExprBuilder.php
  157. +0 −13 vendor/symfony/src/Symfony/Component/DependencyInjection/Configuration/Exception/DuplicateKeyException.php
  158. +0 −12 vendor/symfony/src/Symfony/Component/DependencyInjection/Configuration/Exception/Exception.php
  159. +0 −13 ...r/symfony/src/Symfony/Component/DependencyInjection/Configuration/Exception/ForbiddenOverwriteException.php
  160. +0 −13 ...symfony/src/Symfony/Component/DependencyInjection/Configuration/Exception/InvalidConfigurationException.php
  161. +0 −12 vendor/symfony/src/Symfony/Component/DependencyInjection/Configuration/Exception/InvalidTypeException.php
  162. +0 −13 vendor/symfony/src/Symfony/Component/DependencyInjection/Configuration/Exception/UnsetKeyException.php
  163. +2 −2 vendor/symfony/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
  164. +8 −0 vendor/symfony/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
  165. +1 −1  vendor/symfony/src/Symfony/Component/DomCrawler/Form.php
  166. +2 −4 vendor/symfony/src/Symfony/Component/Finder/Comparator/DateComparator.php
  167. +6 −3 vendor/symfony/src/Symfony/Component/Finder/Finder.php
  168. +1 −1  vendor/symfony/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php
  169. +1 −1  vendor/symfony/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php
  170. +3 −7 vendor/symfony/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php
  171. +2 −4 vendor/symfony/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php
  172. +2 −4 vendor/symfony/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php
  173. +41 −0 vendor/symfony/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
  174. +2 −4 vendor/symfony/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php
  175. +2 −2 vendor/symfony/src/Symfony/Component/Finder/Iterator/SortableIterator.php
  176. +57 −0 vendor/symfony/src/Symfony/Component/Finder/SplFileInfo.php
  177. +1 −1  vendor/symfony/src/Symfony/Component/Form/ChoiceField.php
  178. +34 −7 vendor/symfony/src/Symfony/Component/Form/DateField.php
  179. +2 −2 vendor/symfony/src/Symfony/Component/Form/DateTimeField.php
  180. +11 −1 vendor/symfony/src/Symfony/Component/Form/Field.php
  181. +7 −0 vendor/symfony/src/Symfony/Component/Form/FieldInterface.php
  182. +14 −0 vendor/symfony/src/Symfony/Component/Form/Form.php
  183. +12 −0 vendor/symfony/src/Symfony/Component/Form/HybridField.php
  184. +11 −1 vendor/symfony/src/Symfony/Component/Form/Resources/config/validation.xml
  185. +32 −5 vendor/symfony/src/Symfony/Component/Form/TimeField.php
  186. +16 −12 vendor/symfony/src/Symfony/Component/Form/ValueTransformer/DateTimeToArrayTransformer.php
  187. +2 −2 vendor/symfony/src/Symfony/Component/Form/ValueTransformer/DateTimeToStringTransformer.php
  188. +2 −2 vendor/symfony/src/Symfony/Component/Form/ValueTransformer/DateTimeToTimestampTransformer.php
  189. +2 −2 vendor/symfony/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
  190. +5 −1 vendor/symfony/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
  191. +2 −24 ...fony/src/Symfony/{Bundle/FrameworkBundle → Component/HttpKernel}/DataCollector/ConfigDataCollector.php
  192. +2 −2 vendor/symfony/src/Symfony/Component/HttpKernel/Kernel.php
  193. +3 −0  vendor/symfony/src/Symfony/Component/HttpKernel/Profiler/SQLiteProfilerStorage.php
  194. +1 −2  vendor/symfony/src/Symfony/Component/HttpKernel/bootstrap.php
  195. +4 −3 vendor/symfony/src/Symfony/Component/HttpKernel/bootstrap_cache.php
  196. +4 −4 vendor/symfony/src/Symfony/Component/Security/Acl/Dbal/Schema.php
  197. +4 −5 ...ny/src/Symfony/{Bundle/DoctrineBundle/Security → Component/Security/Acl/Domain}/AclCollectionCache.php
  198. +2 −2 vendor/symfony/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php
  199. +17 −17 vendor/symfony/src/Symfony/Component/Security/Acl/Resources/schema/db2.sql
  200. +20 −20 vendor/symfony/src/Symfony/Component/Security/Acl/Resources/schema/mssql.sql
  201. +11 −11 vendor/symfony/src/Symfony/Component/Security/Acl/Resources/schema/mysql.sql
  202. +128 −128 vendor/symfony/src/Symfony/Component/Security/Acl/Resources/schema/oracle.sql
  203. +20 −20 vendor/symfony/src/Symfony/Component/Security/Acl/Resources/schema/postgresql.sql
  204. +14 −14 vendor/symfony/src/Symfony/Component/Security/Acl/Resources/schema/sqlite.sql
  205. +12 −0 vendor/symfony/src/Symfony/Component/Security/Core/Exception/InvalidCsrfTokenException.php
  206. +70 −0 vendor/symfony/src/Symfony/Component/Security/Core/User/ChainUserProvider.php
  207. +11 −4 ...ony/src/Symfony/{Bundle/DoctrineBundle/Security → Component/Security/Core/User}/EntityUserProvider.php
  208. +20 −5 vendor/symfony/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php
  209. +1 −1  vendor/symfony/src/Symfony/Component/Validator/ExecutionContext.php
  210. +19 −0 vendor/symfony/src/Symfony/Component/Yaml/LICENSE
  211. +1 −1  vendor/symfony/src/Symfony/Component/Yaml/Parser.php
  212. +1 −1  vendor/twig/lib/Twig/CompilerInterface.php
  213. +1 −1  vendor/twig/lib/Twig/ExpressionParser.php
  214. +3 −3 vendor/twig/lib/Twig/Extension/Core.php
  215. +2 −0  vendor/twig/lib/Twig/FilterInterface.php
  216. +2 −0  vendor/twig/lib/Twig/FunctionInterface.php
  217. +1 −1  vendor/twig/lib/Twig/Node/Set.php
  218. +1 −1  vendor/twig/lib/Twig/NodeTraverser.php
  219. +1 −3 vendor/twig/lib/Twig/NodeVisitor/Optimizer.php
  220. +15 −0 vendor/twig/lib/Twig/Parser.php
  221. +6 −8 vendor/twig/lib/Twig/Token.php
  222. +1 −1  vendor/twig/lib/Twig/TokenParser/AutoEscape.php
  223. +1 −1  vendor/twig/lib/Twig/TokenParser/Block.php
  224. +1 −1  vendor/twig/lib/Twig/TokenParser/Filter.php
  225. +2 −2 vendor/twig/lib/Twig/TokenParser/For.php
  226. +2 −2 vendor/twig/lib/Twig/TokenParser/If.php
  227. +8 −1 vendor/twig/lib/Twig/TokenParser/Macro.php
  228. +1 −1  vendor/twig/lib/Twig/TokenParser/Sandbox.php
  229. +1 −1  vendor/twig/lib/Twig/TokenParser/Set.php
  230. +1 −1  vendor/twig/lib/Twig/TokenParser/Spaceless.php
  231. +4 −4 vendor/twig/lib/Twig/TokenParserBroker.php
  232. 0  vendor/{zend/library → zend-log}/Zend/Log/Exception.php
  233. 0  vendor/{zend/library → zend-log}/Zend/Log/Exception/InvalidArgumentException.php
  234. 0  vendor/{zend/library → zend-log}/Zend/Log/Exception/NotImplementedException.php
  235. 0  vendor/{zend/library → zend-log}/Zend/Log/Exception/RuntimeException.php
  236. 0  vendor/{zend/library → zend-log}/Zend/Log/Factory.php
  237. 0  vendor/{zend/library → zend-log}/Zend/Log/Filter.php
  238. 0  vendor/{zend/library → zend-log}/Zend/Log/Filter/AbstractFilter.php
  239. 0  vendor/{zend/library → zend-log}/Zend/Log/Filter/Message.php
  240. 0  vendor/{zend/library → zend-log}/Zend/Log/Filter/Priority.php
  241. 0  vendor/{zend/library → zend-log}/Zend/Log/Filter/SuppressFilter.php
  242. 0  vendor/{zend/library → zend-log}/Zend/Log/Formatter.php
  243. 0  vendor/{zend/library → zend-log}/Zend/Log/Formatter/Firebug.php
  244. 0  vendor/{zend/library → zend-log}/Zend/Log/Formatter/Simple.php
  245. 0  vendor/{zend/library → zend-log}/Zend/Log/Formatter/Xml.php
  246. 0  vendor/{zend/library → zend-log}/Zend/Log/Logger.php
  247. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer.php
  248. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer/AbstractWriter.php
  249. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer/Db.php
  250. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer/Firebug.php
  251. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer/Mail.php
  252. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer/Mock.php
  253. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer/Null.php
  254. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer/Stream.php
  255. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer/Syslog.php
  256. 0  vendor/{zend/library → zend-log}/Zend/Log/Writer/ZendMonitor.php
  257. +0 −27 vendor/zend/LICENSE.txt
  258. +0 −35 vendor/zend/library/Zend/Exception.php
View
2  LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2010 Fabien Potencier
+Copyright (c) 2004-2011 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
View
0  bin/create_sandbox.sh → bin/build.sh
File renamed without changes
View
4 bin/prepare.sh
@@ -68,10 +68,6 @@ cd $TARGET
cd twig-extensions && rm -rf README doc phpunit.xml* test
cd $TARGET
-# Zend Framework
-cd zend && rm -rf INSTALL.txt README* bin demos documentation resources tests tools working; mkdir library/tmp; mv library/Zend/Exception.php library/tmp/; mv library/Zend/Log library/tmp/; rm -rf library/Zend; mv library/tmp library/Zend
-cd $TARGET
-
# cleanup
find . -name .git | xargs rm -rf -
find . -name .gitignore | xargs rm -rf -
View
27 bin/vendors.sh
@@ -36,16 +36,16 @@ install_git()
}
# Assetic
-install_git assetic git://github.com/kriswallsmith/assetic.git origin/master
+install_git assetic git://github.com/kriswallsmith/assetic.git
# Symfony
-install_git symfony git://github.com/fabpot/symfony.git origin/master
+install_git symfony git://github.com/fabpot/symfony.git
# Doctrine ORM
install_git doctrine git://github.com/doctrine/doctrine2.git 2.0.1
# Doctrine Data Fixtures Extension
-install_git doctrine-data-fixtures git://github.com/doctrine/data-fixtures.git origin/master
+install_git doctrine-data-fixtures git://github.com/doctrine/data-fixtures.git
# Doctrine DBAL
install_git doctrine-dbal git://github.com/doctrine/dbal.git 2.0.1
@@ -54,22 +54,25 @@ install_git doctrine-dbal git://github.com/doctrine/dbal.git 2.0.1
install_git doctrine-common git://github.com/doctrine/common.git 2.0.1
# Doctrine migrations
-install_git doctrine-migrations git://github.com/doctrine/migrations.git origin/master
+install_git doctrine-migrations git://github.com/doctrine/migrations.git
# Doctrine MongoDB
-install_git doctrine-mongodb git://github.com/doctrine/mongodb.git origin/master
+install_git doctrine-mongodb git://github.com/doctrine/mongodb.git
# Doctrine MongoDB
-install_git doctrine-mongodb-odm git://github.com/doctrine/mongodb-odm.git origin/master
+install_git doctrine-mongodb-odm git://github.com/doctrine/mongodb-odm.git
# Swiftmailer
install_git swiftmailer git://github.com/swiftmailer/swiftmailer.git origin/4.1
# Twig
-install_git twig git://github.com/fabpot/Twig.git origin/master
+install_git twig git://github.com/fabpot/Twig.git
-# Zend Framework
-install_git zend git://github.com/zendframework/zf2.git origin/master
-cd zend
-git submodule update --recursive --init
-cd ..
+# Twig Extensions
+install_git twig-extensions git://github.com/fabpot/Twig-extensions.git
+
+# Zend Framework Log
+mkdir -p zend-log/Zend
+cd zend-log/Zend
+install_git Log git://github.com/symfony/zend-log.git
+cd ../..
View
3  vendor/assetic/phpunit.xml.dist
@@ -11,7 +11,8 @@
<!-- <server name="TWIG_PATH" value="/path/to/twig/lib" /> -->
<!-- <server name="YUI_COMPRESSOR_PATH" value="/path/to/yuicompressor-2.4.2.jar" /> -->
<!-- <server name="GOOGLE_CLOSURE_COMPILER_PATH" value="/path/to/google-closure/compiler.jar" /> -->
- <!-- <server name="LESSC_PATH" value="/path/to/lessc" /> -->
+ <!-- <server name="NODE_BIN" value="/path/to/node" /> -->
+ <!-- <server name="NODE_PATH" value="/path/to/node/lib" /> -->
<!-- <server name="SASS_PATH" value="/path/to/sass" /> -->
<!-- <server name="SPROCKETIZE_PATH" value="/path/to/sprocketize" /> -->
<!-- <server name="COFFEE_PATH" value="/path/to/coffee" /> -->
View
4 vendor/assetic/src/Assetic/Cache/FilesystemCache.php
@@ -37,6 +37,10 @@ public function get($key)
public function set($key, $value)
{
+ if (!is_dir($this->dir)) {
+ mkdir($this->dir, 0777, true);
+ }
+
file_put_contents($this->dir.'/'.$key, $value);
}
View
17 vendor/assetic/src/Assetic/Filter/CoffeeScriptFilter.php
@@ -22,21 +22,26 @@
class CoffeeScriptFilter implements FilterInterface
{
private $coffeePath;
+ private $nodePath;
- public function __construct($coffeePath = '/usr/bin/coffee')
+ public function __construct($coffeePath = '/usr/bin/coffee', $nodePath = '/usr/bin/node')
{
$this->coffeePath = $coffeePath;
+ $this->nodePath = $nodePath;
}
public function filterLoad(AssetInterface $asset)
{
- $input = tempnam(sys_get_temp_dir(), 'assetic_coffee');
- file_put_contents($input, $asset->getContent());
+ $options = array($this->nodePath, $this->coffeePath, '-sc');
- $output = shell_exec(sprintf('cat %s | coffee -sc', escapeshellarg($input)));
- unlink($input);
+ $proc = new Process(implode(' ', array_map('escapeshellarg', $options)), null, array(), $asset->getContent());
+ $code = $proc->run();
- $asset->setContent($output);
+ if (0 < $code) {
+ throw new \RuntimeException($proc->getErrorOutput());
+ }
+
+ $asset->setContent($proc->getOutput());
}
public function filterDump(AssetInterface $asset)
View
13 vendor/assetic/src/Assetic/Filter/GoogleClosure/CompilerJarFilter.php
@@ -12,6 +12,7 @@
namespace Assetic\Filter\GoogleClosure;
use Assetic\Asset\AssetInterface;
+use Assetic\Filter\Process;
/**
* Filter for the Google Closure Compiler JAR.
@@ -80,12 +81,14 @@ public function filterDump(AssetInterface $asset)
$options[] = $cleanup[] = $input = tempnam(sys_get_temp_dir(), 'assetic_google_closure_compiler');
file_put_contents($input, $asset->getContent());
- // todo: check for a valid return code
- $output = shell_exec(implode(' ', array_map('escapeshellarg', $options)));
-
- // cleanup temp files
+ $proc = new Process(implode(' ', array_map('escapeshellarg', $options)));
+ $code = $proc->run();
array_map('unlink', $cleanup);
- $asset->setContent($output);
+ if (0 < $code) {
+ throw new \RuntimeException($proc->getErrorOutput());
+ }
+
+ $asset->setContent($proc->getOutput());
}
}
View
84 vendor/assetic/src/Assetic/Filter/LessFilter.php
@@ -20,40 +20,90 @@
*/
class LessFilter implements FilterInterface
{
- private $lessPath;
- private $debug;
+ private $baseDir;
+ private $nodeBin;
+ private $nodePaths;
+ private $compress;
- public function __construct($lessPath = '/usr/bin/lessc')
+ /**
+ * Constructor.
+ *
+ * @param string $baseDir The base web directory
+ * @param string $nodeBin The path to the node binary
+ * @param array $nodePaths An array of node paths
+ */
+ public function __construct($baseDir, $nodeBin = '/usr/bin/node', array $nodePaths = array())
{
- $this->lessPath = $lessPath;
+ $this->baseDir = $baseDir;
+ $this->nodeBin = $nodeBin;
+ $this->nodePaths = $nodePaths;
}
- public function setDebug($debug)
+ public function setCompress($compress)
{
- $this->debug = $debug;
+ $this->compress = $compress;
}
public function filterLoad(AssetInterface $asset)
{
- $options = array($this->lessPath);
+ static $format = <<<JAVASCRIPT
+var less = require('less');
+var sys = require('sys');
- if ($this->debug) {
- $options[] = '--debug';
+new(less.Parser)(%s).parse(%s, function(e, tree) {
+ if (e) {
+ less.writeError(e);
+ process.exit(2);
+ }
+
+ try {
+ sys.print(tree.toCSS(%s));
+ process.exit(0);
+ } catch (e) {
+ less.writeError(e);
+ process.exit(3);
+ }
+});
+
+JAVASCRIPT;
+
+ // parser options
+ $parserOptions = array();
+ if ($sourceUrl = $asset->getSourceUrl()) {
+ $parserOptions['paths'] = array($this->baseDir.'/'.dirname($sourceUrl));
+ $parserOptions['filename'] = basename($sourceUrl);
}
- $options[] = $input = tempnam(sys_get_temp_dir(), 'assetic_less');
- file_put_contents($input, $asset->getContent());
+ // tree options
+ $treeOptions = array();
+ if (null !== $this->compress) {
+ $treeOptions['compress'] = $this->compress;
+ }
- $options[] = $output = tempnam(sys_get_temp_dir(), 'assetic_less');
+ // node.js configuration
+ $env = array();
+ if (0 < count($this->nodePaths)) {
+ $env['NODE_PATH'] = implode(':', $this->nodePaths);
+ }
- // todo: check for a valid return code
- shell_exec(implode(' ', array_map('escapeshellarg', $options)));
+ $options = array($this->nodeBin);
- $asset->setContent(file_get_contents($output));
+ $options[] = $input = tempnam(sys_get_temp_dir(), 'assetic_less');
+ file_put_contents($input, sprintf($format,
+ json_encode($parserOptions),
+ json_encode($asset->getContent()),
+ json_encode($treeOptions)
+ ));
- // cleanup
+ $proc = new Process(implode(' ', array_map('escapeshellarg', $options)), null, $env);
+ $code = $proc->run();
unlink($input);
- unlink($output);
+
+ if (0 < $code) {
+ throw new \RuntimeException($proc->getErrorOutput());
+ }
+
+ $asset->setContent($proc->getOutput());
}
public function filterDump(AssetInterface $asset)
View
279 vendor/assetic/src/Assetic/Filter/Process.php
@@ -0,0 +1,279 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * Copyright (c) 2004-2010 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Assetic\Filter;
+
+/**
+ * Process is a thin wrapper around proc_* functions to ease
+ * start independent PHP processes.
+ *
+ * @author Fabien Potencier <fabien.potencier@symfony-project.com>
+ */
+class Process
+{
+ protected $commandline;
+ protected $cwd;
+ protected $env;
+ protected $stdin;
+ protected $timeout;
+ protected $options;
+ protected $exitcode;
+ protected $status;
+ protected $stdout;
+ protected $stderr;
+
+ /**
+ * Constructor.
+ *
+ * @param string $commandline The command line to run
+ * @param string $cwd The working directory
+ * @param array $env The environment variables
+ * @param string $stdin The STDIN content
+ * @param integer $timeout The timeout in seconds
+ * @param array $options An array of options for proc_open
+ *
+ * @throws \RuntimeException When proc_open is not installed
+ */
+ public function __construct($commandline, $cwd = null, array $env = array(), $stdin = null, $timeout = 60, array $options = array())
+ {
+ if (!function_exists('proc_open')) {
+ throw new \RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.');
+ }
+
+ $this->commandline = $commandline;
+ $this->cwd = null === $cwd ? getcwd() : $cwd;
+ $this->env = array();
+ foreach ($env as $key => $value) {
+ $this->env[(binary) $key] = (binary) $value;
+ }
+ $this->stdin = $stdin;
+ $this->timeout = $timeout;
+ $this->options = array_merge($options, array('suppress_errors' => true, 'binary_pipes' => true));
+ }
+
+ /**
+ * Runs the process.
+ *
+ * The callback receives the type of output (out or err) and
+ * some bytes from the output in real-time. It allows to have feedback
+ * from the independent process during execution.
+ *
+ * If you don't provide a callback, the STDOUT and STDERR are available only after
+ * the process is finished via the getOutput() and getErrorOutput() methods.
+ *
+ * @param Closure|string|array $callback A PHP callback to run whenever there is some
+ * output available on STDOUT or STDERR
+ *
+ * @return integer The exit status code
+ *
+ * @throws \RuntimeException When process can't be launch or is stopped
+ */
+ public function run($callback = null)
+ {
+ if (null === $callback) {
+ $this->stdout = '';
+ $this->stderr = '';
+ $that = $this;
+ $callback = function ($type, $line) use ($that)
+ {
+ if ('out' == $type) {
+ $that->addOutput($line);
+ } else {
+ $that->addErrorOutput($line);
+ }
+ };
+ }
+
+ $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
+
+ $process = proc_open($this->commandline, $descriptors, $pipes, $this->cwd, $this->env, $this->options);
+
+ stream_set_blocking($pipes[1], false);
+ stream_set_blocking($pipes[2], false);
+
+ if (!is_resource($process)) {
+ throw new \RuntimeException('Unable to launch a new process.');
+ }
+
+ if (null !== $this->stdin) {
+ fwrite($pipes[0], (binary) $this->stdin);
+ }
+ fclose($pipes[0]);
+
+ while (true) {
+ $r = $pipes;
+ $w = null;
+ $e = null;
+
+ $n = @stream_select($r, $w, $e, $this->timeout);
+
+ if (false === $n) {
+ break;
+ } elseif ($n === 0) {
+ proc_terminate($process);
+
+ throw new \RuntimeException('The process timed out.');
+ } elseif ($n > 0) {
+ $called = false;
+
+ while (true) {
+ $c = false;
+ if ($line = (binary) fgets($pipes[1], 1024)) {
+ $called = $c = true;
+ call_user_func($callback, 'out', $line);
+ }
+
+ if ($line = fgets($pipes[2], 1024)) {
+ $called = $c = true;
+ call_user_func($callback, 'err', $line);
+ }
+
+ if (!$c) {
+ break;
+ }
+ }
+
+ if (!$called) {
+ break;
+ }
+ }
+ }
+
+ $this->status = proc_get_status($process);
+
+ proc_close($process);
+
+ if ($this->status['signaled']) {
+ throw new \RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->status['stopsig']));
+ }
+
+ return $this->exitcode = $this->status['exitcode'];
+ }
+
+ /**
+ * Returns the output of the process (STDOUT).
+ *
+ * This only returns the output if you have not supplied a callback
+ * to the run() method.
+ *
+ * @return string The process output
+ */
+ public function getOutput()
+ {
+ return $this->stdout;
+ }
+
+ /**
+ * Returns the error output of the process (STDERR).
+ *
+ * This only returns the error output if you have not supplied a callback
+ * to the run() method.
+ *
+ * @return string The process error output
+ */
+ public function getErrorOutput()
+ {
+ return $this->stderr;
+ }
+
+ /**
+ * Returns the exit code returned by the process.
+ *
+ * @return integer The exit status code
+ */
+ public function getExitCode()
+ {
+ return $this->exitcode;
+ }
+
+ /**
+ * Checks if the process ended successfully.
+ *
+ * @return Boolean true if the process ended successfully, false otherwise
+ */
+ public function isSuccessful()
+ {
+ return 0 == $this->exitcode;
+ }
+
+ /**
+ * Returns true if the child process has been terminated by an uncaught signal.
+ *
+ * It always returns false on Windows.
+ *
+ * @return Boolean
+ */
+ public function hasBeenSignaled()
+ {
+ return $this->status['signaled'];
+ }
+
+ /**
+ * Returns the number of the signal that caused the child process to terminate its execution.
+ *
+ * It is only meaningful if hasBeenSignaled() returns true.
+ *
+ * @return integer
+ */
+ public function getTermSignal()
+ {
+ return $this->status['termsig'];
+ }
+
+ /**
+ * Returns true if the child process has been stopped by a signal.
+ *
+ * It always returns false on Windows.
+ *
+ * @return Boolean
+ */
+ public function hasBeenStopped()
+ {
+ return $this->status['stopped'];
+ }
+
+ /**
+ * Returns the number of the signal that caused the child process to stop its execution
+ *
+ * It is only meaningful if hasBeenStopped() returns true.
+ *
+ * @return integer
+ */
+ public function getStopSignal()
+ {
+ return $this->status['stopsig'];
+ }
+
+ public function addOutput($line)
+ {
+ $this->stdout .= $line;
+ }
+
+ public function addErrorOutput($line)
+ {
+ $this->stderr .= $line;
+ }
+}
View
13 vendor/assetic/src/Assetic/Filter/Sass/SassFilter.php
@@ -11,8 +11,9 @@
namespace Assetic\Filter\Sass;
-use Assetic\Filter\FilterInterface;
use Assetic\Asset\AssetInterface;
+use Assetic\Filter\FilterInterface;
+use Assetic\Filter\Process;
/**
* Loads SASS files.
@@ -137,12 +138,16 @@ public function filterLoad(AssetInterface $asset)
$options[] = $output = tempnam(sys_get_temp_dir(), 'assetic_sass');
- // todo: check for a valid return code
- shell_exec(implode(' ', array_map('escapeshellarg', $options)));
+ $proc = new Process(implode(' ', array_map('escapeshellarg', $options)));
+ $code = $proc->run();
+
+ if (0 < $code) {
+ unlink($input);
+ throw new \RuntimeException($proc->getErrorOutput());
+ }
$asset->setContent(file_get_contents($output));
- // cleanup
unlink($input);
unlink($output);
}
View
12 vendor/assetic/src/Assetic/Filter/SprocketsFilter.php
@@ -67,11 +67,15 @@ public function filterLoad(AssetInterface $asset)
file_put_contents($tmp, $asset->getContent());
rename($tmp, $input);
- // todo: check for a valid return code
- $output = shell_exec(implode(' ', array_map('escapeshellarg', $options)));
- $asset->setContent($output);
-
+ $proc = new Process(implode(' ', array_map('escapeshellarg', $options)));
+ $code = $proc->run();
unlink($input);
+
+ if (0 < $code) {
+ throw new \RuntimeException($proc->getErrorOutput());
+ }
+
+ $asset->setContent($proc->getOutput());
}
public function filterDump(AssetInterface $asset)
View
13 vendor/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php
@@ -13,6 +13,7 @@
use Assetic\Asset\AssetInterface;
use Assetic\Filter\FilterInterface;
+use Assetic\Filter\Process;
/**
* Base YUI compressor filter.
@@ -79,12 +80,14 @@ protected function compress($content, $type, $options = array())
$options[] = $input = tempnam(sys_get_temp_dir(), 'assetic');
file_put_contents($input, $content);
- // todo: check for a valid return code
- $output = shell_exec(implode(' ', array_map('escapeshellarg', $options)));
-
- // cleanup
+ $proc = new Process(implode(' ', array_map('escapeshellarg', $options)));
+ $code = $proc->run();
unlink($input);
- return $output;
+ if (0 < $code) {
+ throw new \RuntimeException($proc->getErrorOutput());
+ }
+
+ return $proc->getOutput();
}
}
View
84 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/AbstractMigration.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -31,53 +29,85 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
abstract class AbstractMigration
{
- /** The Migrations Configuration instance for this migration */
- protected $_configuration;
+ /**
+ * The Migrations Configuration instance for this migration
+ *
+ * @var Configuration
+ */
+ private $configuration;
- /** The OutputWriter object instance used for outputting information */
- protected $_outputWriter;
+ /**
+ * The OutputWriter object instance used for outputting information
+ *
+ * @var OutputWriter
+ */
+ private $outputWriter;
- /** The Doctrine\DBAL\Connection instance we are migrating */
- protected $_connection;
+ /**
+ * The Doctrine\DBAL\Connection instance we are migrating
+ *
+ * @var Connection
+ */
+ protected $connection;
- /** Reference to the SchemaManager instance referened by $_connection */
- protected $_sm;
+ /**
+ * Reference to the SchemaManager instance referened by $_connection
+ *
+ * @var \Doctrine\DBAL\Schema\AbstractSchemaManager
+ */
+ protected $sm;
- /** Reference to the DatabasePlatform instance referenced by $_conection */
- protected $_platform;
+ /**
+ * Reference to the DatabasePlatform instance referenced by $_conection
+ *
+ * @var \Doctrine\DBAL\Platforms\AbstractPlatform
+ */
+ protected $platform;
- /** Reference to the Version instance representing this migration */
- protected $_version;
+ /**
+ * Reference to the Version instance representing this migration
+ *
+ * @var Version
+ */
+ protected $version;
public function __construct(Version $version)
{
- $this->_configuration = $version->getConfiguration();
- $this->_outputWriter = $this->_configuration->getOutputWriter();
- $this->_connection = $this->_configuration->getConnection();
- $this->_sm = $this->_connection->getSchemaManager();
- $this->_platform = $this->_connection->getDatabasePlatform();
- $this->_version = $version;
+ $this->configuration = $version->getConfiguration();
+ $this->outputWriter = $this->configuration->getOutputWriter();
+ $this->connection = $this->configuration->getConnection();
+ $this->sm = $this->connection->getSchemaManager();
+ $this->platform = $this->connection->getDatabasePlatform();
+ $this->version = $version;
+ }
+
+ /**
+ * Get custom migration name
+ *
+ * @return string
+ */
+ public function getName()
+ {
}
abstract public function up(Schema $schema);
abstract public function down(Schema $schema);
- protected function _addSql($sql)
+ protected function addSql($sql)
{
- return $this->_version->addSql($sql);
+ return $this->version->addSql($sql);
}
- protected function _write($message)
+ protected function write($message)
{
- $this->_outputWriter->write($message);
+ $this->outputWriter->write($message);
}
- protected function _throwIrreversibleMigrationException($message = null)
+ protected function throwIrreversibleMigrationException($message = null)
{
if ($message === null) {
$message = 'This migration is irreversible and cannot be reverted.';
@@ -96,7 +126,7 @@ public function warnIf($condition, $message = '')
$message = (strlen($message)) ? $message : 'Unknown Reason';
if ($condition === true) {
- $this->_outputWriter->write(' <warning>Warning during ' . $this->_version->getExecutionState() . ': ' . $message . '</warning>');
+ $this->outputWriter->write(' <warning>Warning during ' . $this->version->getExecutionState() . ': ' . $message . '</warning>');
}
}
View
33 ...trine-migrations/lib/Doctrine/DBAL/Migrations/Configuration/AbstractFileConfiguration.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -30,16 +28,23 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
abstract class AbstractFileConfiguration extends Configuration
{
- /** The configuration file used to load configuration information */
- private $_file;
+ /**
+ * The configuration file used to load configuration information
+ *
+ * @var string
+ */
+ private $file;
- /** Whether or not the configuration file has been loaded yet or not */
- private $_loaded = false;
+ /**
+ * Whether or not the configuration file has been loaded yet or not
+ *
+ * @var bool
+ */
+ private $loaded = false;
/**
* Load the information from the passed configuration file
@@ -50,18 +55,18 @@
*/
public function load($file)
{
- if ($this->_loaded) {
+ if ($this->loaded) {
throw MigrationsException::configurationFileAlreadyLoaded();
}
if (file_exists($path = getcwd() . '/' . $file)) {
$file = $path;
}
- $this->_file = $file;
- $this->_load($file);
- $this->_loaded = true;
+ $this->file = $file;
+ $this->doLoad($file);
+ $this->loaded = true;
}
- protected function _getDirectoryRelativeToFile($file, $input)
+ protected function getDirectoryRelativeToFile($file, $input)
{
$path = realpath(dirname($file) . '/' . $input);
if ($path !== false) {
@@ -74,7 +79,7 @@ protected function _getDirectoryRelativeToFile($file, $input)
public function getFile()
{
- return $this->_file;
+ return $this->file;
}
/**
@@ -84,5 +89,5 @@ public function getFile()
*
* @param string $file The path to a configuration file.
*/
- abstract protected function _load($file);
+ abstract protected function doLoad($file);
}
View
147 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Configuration/Configuration.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -37,34 +35,65 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
class Configuration
{
- /** Name of this set of migrations */
- private $_name;
+ /**
+ * Name of this set of migrations
+ *
+ * @var string
+ */
+ private $name;
- /** Flag for whether or not the migration table has been created */
- private $_migrationTableCreated = false;
+ /**
+ * Flag for whether or not the migration table has been created
+ *
+ * @var bool
+ */
+ private $migrationTableCreated = false;
- /** Connection instance to use for migrations */
- private $_connection;
+ /**
+ * Connection instance to use for migrations
+ *
+ * @var Connection
+ */
+ private $connection;
- /** OutputWriter instance for writing output during migrations */
- private $_outputWriter;
+ /**
+ * OutputWriter instance for writing output during migrations
+ *
+ * @var OutputWriter
+ */
+ private $outputWriter;
- /** The migration table name to track versions in */
- private $_migrationsTableName = 'doctrine_migration_versions';
+ /**
+ * The migration table name to track versions in
+ *
+ * @var string
+ */
+ private $migrationsTableName = 'doctrine_migration_versions';
- /** The path to a directory where new migration classes will be written */
- private $_migrationsDirectory;
+ /**
+ * The path to a directory where new migration classes will be written
+ *
+ * @var string
+ */
+ private $migrationsDirectory;
- /** Namespace the migration classes live in */
- private $_migrationsNamespace;
+ /**
+ * Namespace the migration classes live in
+ *
+ * @var string
+ */
+ private $migrationsNamespace;
- /** Array of the registered migrations */
- private $_migrations = array();
+ /**
+ * Array of the registered migrations
+ *
+ * @var array
+ */
+ private $migrations = array();
/**
* Construct a migration configuration object.
@@ -74,11 +103,11 @@ class Configuration
*/
public function __construct(Connection $connection, OutputWriter $outputWriter = null)
{
- $this->_connection = $connection;
+ $this->connection = $connection;
if ($outputWriter === null) {
$outputWriter = new OutputWriter();
}
- $this->_outputWriter = $outputWriter;
+ $this->outputWriter = $outputWriter;
}
/**
@@ -89,10 +118,10 @@ public function __construct(Connection $connection, OutputWriter $outputWriter =
*/
public function validate()
{
- if ( ! $this->_migrationsNamespace) {
+ if ( ! $this->migrationsNamespace) {
throw MigrationException::migrationsNamespaceRequired();
}
- if ( ! $this->_migrationsDirectory) {
+ if ( ! $this->migrationsDirectory) {
throw MigrationException::migrationsDirectoryRequired();
}
}
@@ -104,7 +133,7 @@ public function validate()
*/
public function setName($name)
{
- $this->_name = $name;
+ $this->name = $name;
}
/**
@@ -114,7 +143,7 @@ public function setName($name)
*/
public function getName()
{
- return $this->_name;
+ return $this->name;
}
/**
@@ -124,7 +153,7 @@ public function getName()
*/
public function getOutputWriter()
{
- return $this->_outputWriter;
+ return $this->outputWriter;
}
/**
@@ -152,7 +181,7 @@ public function formatVersion($version)
*/
public function getConnection()
{
- return $this->_connection;
+ return $this->connection;
}
/**
@@ -162,7 +191,7 @@ public function getConnection()
*/
public function setMigrationsTableName($tableName)
{
- $this->_migrationsTableName = $tableName;
+ $this->migrationsTableName = $tableName;
}
/**
@@ -172,7 +201,7 @@ public function setMigrationsTableName($tableName)
*/
public function getMigrationsTableName()
{
- return $this->_migrationsTableName;
+ return $this->migrationsTableName;
}
/**
@@ -182,7 +211,7 @@ public function getMigrationsTableName()
*/
public function setMigrationsDirectory($migrationsDirectory)
{
- $this->_migrationsDirectory = $migrationsDirectory;
+ $this->migrationsDirectory = $migrationsDirectory;
}
/**
@@ -192,7 +221,7 @@ public function setMigrationsDirectory($migrationsDirectory)
*/
public function getMigrationsDirectory()
{
- return $this->_migrationsDirectory;
+ return $this->migrationsDirectory;
}
/**
@@ -202,7 +231,7 @@ public function getMigrationsDirectory()
*/
public function setMigrationsNamespace($migrationsNamespace)
{
- $this->_migrationsNamespace = $migrationsNamespace;
+ $this->migrationsNamespace = $migrationsNamespace;
}
/**
@@ -212,7 +241,7 @@ public function setMigrationsNamespace($migrationsNamespace)
*/
public function getMigrationsNamespace()
{
- return $this->_migrationsNamespace;
+ return $this->migrationsNamespace;
}
/**
@@ -233,7 +262,7 @@ public function registerMigrationsFromDirectory($path)
require_once($file);
$info = pathinfo($file);
$version = substr($info['filename'], 7);
- $class = $this->_migrationsNamespace . '\\' . $info['filename'];
+ $class = $this->migrationsNamespace . '\\' . $info['filename'];
$versions[] = $this->registerMigration($version, $class);
}
return $versions;
@@ -250,12 +279,12 @@ public function registerMigration($version, $class)
{
$version = (string) $version;
$class = (string) $class;
- if (isset($this->_migrations[$version])) {
- throw MigrationException::duplicateMigrationVersion($version, get_class($this->_migrations[$version]));
+ if (isset($this->migrations[$version])) {
+ throw MigrationException::duplicateMigrationVersion($version, get_class($this->migrations[$version]));
}
$version = new Version($this, $version, $class);
- $this->_migrations[$version->getVersion()] = $version;
- ksort($this->_migrations);
+ $this->migrations[$version->getVersion()] = $version;
+ ksort($this->migrations);
return $version;
}
@@ -283,7 +312,7 @@ public function registerMigrations(array $migrations)
*/
public function getMigrations()
{
- return $this->_migrations;
+ return $this->migrations;
}
/**
@@ -295,10 +324,10 @@ public function getMigrations()
*/
public function getVersion($version)
{
- if ( ! isset($this->_migrations[$version])) {
- MigrationException::unknownMigrationVersion($version);
+ if ( ! isset($this->migrations[$version])) {
+ throw MigrationException::unknownMigrationVersion($version);
}
- return $this->_migrations[$version];
+ return $this->migrations[$version];
}
/**
@@ -309,7 +338,7 @@ public function getVersion($version)
*/
public function hasVersion($version)
{
- return isset($this->_migrations[$version]) ? true : false;
+ return isset($this->migrations[$version]) ? true : false;
}
/**
@@ -322,7 +351,7 @@ public function hasVersionMigrated(Version $version)
{
$this->createMigrationTable();
- $version = $this->_connection->fetchColumn("SELECT version FROM " . $this->_migrationsTableName . " WHERE version = '" . $version->getVersion() . "'");
+ $version = $this->connection->fetchColumn("SELECT version FROM " . $this->migrationsTableName . " WHERE version = ?", array($version->getVersion()));
return $version !== false ? true : false;
}
@@ -335,7 +364,7 @@ public function getCurrentVersion()
{
$this->createMigrationTable();
- $result = $this->_connection->fetchColumn("SELECT version FROM " . $this->_migrationsTableName . " ORDER BY version DESC LIMIT 1");
+ $result = $this->connection->fetchColumn("SELECT version FROM " . $this->migrationsTableName . " ORDER BY version DESC LIMIT 1");
return $result !== false ? (string) $result : '0';
}
@@ -348,7 +377,7 @@ public function getNumberOfExecutedMigrations()
{
$this->createMigrationTable();
- $result = $this->_connection->fetchColumn("SELECT COUNT(version) FROM " . $this->_migrationsTableName);
+ $result = $this->connection->fetchColumn("SELECT COUNT(version) FROM " . $this->migrationsTableName);
return $result !== false ? $result : 0;
}
@@ -359,7 +388,7 @@ public function getNumberOfExecutedMigrations()
*/
public function getNumberOfAvailableMigrations()
{
- return count($this->_migrations);
+ return count($this->migrations);
}
/**
@@ -369,7 +398,7 @@ public function getNumberOfAvailableMigrations()
*/
public function getLatestVersion()
{
- $versions = array_keys($this->_migrations);
+ $versions = array_keys($this->migrations);
$latest = end($versions);
return $latest !== false ? (string) $latest : '0';
}
@@ -383,20 +412,20 @@ public function createMigrationTable()
{
$this->validate();
- if ($this->_migrationTableCreated) {
+ if ($this->migrationTableCreated) {
return false;
}
- $schema = $this->_connection->getSchemaManager()->createSchema();
- if ( ! $schema->hasTable($this->_migrationsTableName)) {
+ $schema = $this->connection->getSchemaManager()->createSchema();
+ if ( ! $schema->hasTable($this->migrationsTableName)) {
$columns = array(
'version' => new Column('version', Type::getType('string'), array('length' => 14)),
);
- $table = new Table($this->_migrationsTableName, $columns);
+ $table = new Table($this->migrationsTableName, $columns);
$table->setPrimaryKey(array('version'));
- $this->_connection->getSchemaManager()->createTable($table);
+ $this->connection->getSchemaManager()->createTable($table);
- $this->_migrationTableCreated = true;
+ $this->migrationTableCreated = true;
return true;
}
@@ -414,15 +443,15 @@ public function createMigrationTable()
public function getMigrationsToExecute($direction, $to)
{
if ($direction === 'down') {
- $allVersions = array_reverse(array_keys($this->_migrations));
- $classes = array_reverse(array_values($this->_migrations));
+ $allVersions = array_reverse(array_keys($this->migrations));
+ $classes = array_reverse(array_values($this->migrations));
$allVersions = array_combine($allVersions, $classes);
} else {
- $allVersions = $this->_migrations;
+ $allVersions = $this->migrations;
}
$versions = array();
foreach ($allVersions as $version) {
- if ($this->_shouldExecuteMigration($direction, $version, $to)) {
+ if ($this->shouldExecuteMigration($direction, $version, $to)) {
$versions[$version->getVersion()] = $version;
}
}
@@ -438,7 +467,7 @@ public function getMigrationsToExecute($direction, $to)
* @param string $to The version we are migrating to.
* @return void
*/
- private function _shouldExecuteMigration($direction, Version $version, $to)
+ private function shouldExecuteMigration($direction, Version $version, $to)
{
if ($direction === 'down') {
if ( ! $this->hasVersionMigrated($version)) {
View
7 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Configuration/XmlConfiguration.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -27,7 +25,6 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
class XmlConfiguration extends AbstractFileConfiguration
@@ -35,7 +32,7 @@ class XmlConfiguration extends AbstractFileConfiguration
/**
* @inheritdoc
*/
- protected function _load($file)
+ protected function doLoad($file)
{
$xml = simplexml_load_file($file);
if (isset($xml->name)) {
@@ -48,7 +45,7 @@ protected function _load($file)
$this->setMigrationsNamespace((string) $xml->{'migrations-namespace'});
}
if (isset($xml->{'migrations-directory'})) {
- $migrationsDirectory = $this->_getDirectoryRelativeToFile($file, (string) $xml->{'migrations-directory'});
+ $migrationsDirectory = $this->getDirectoryRelativeToFile($file, (string) $xml->{'migrations-directory'});
$this->setMigrationsDirectory($migrationsDirectory);
$this->registerMigrationsFromDirectory($migrationsDirectory);
}
View
7 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Configuration/YamlConfiguration.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -29,7 +27,6 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
class YamlConfiguration extends AbstractFileConfiguration
@@ -37,7 +34,7 @@ class YamlConfiguration extends AbstractFileConfiguration
/**
* @inheritdoc
*/
- protected function _load($file)
+ protected function doLoad($file)
{
$array = Yaml::load($file);
@@ -51,7 +48,7 @@ protected function _load($file)
$this->setMigrationsNamespace($array['migrations_namespace']);
}
if (isset($array['migrations_directory'])) {
- $migrationsDirectory = $this->_getDirectoryRelativeToFile($file, $array['migrations_directory']);
+ $migrationsDirectory = $this->getDirectoryRelativeToFile($file, $array['migrations_directory']);
$this->setMigrationsDirectory($migrationsDirectory);
$this->registerMigrationsFromDirectory($migrationsDirectory);
}
View
3  vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/IrreversibleMigrationException.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -28,7 +26,6 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
class IrreversibleMigrationException extends \Exception
View
47 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/Migration.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -30,16 +28,21 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
class Migration
{
- /** The Doctrine\DBAL\Connection instance we are migrating */
- private $_connection;
+ /**
+ * The OutputWriter object instance used for outputting information
+ *
+ * @var OutputWriter
+ */
+ private $outputWriter;
- /** The OutputWriter object instance used for outputting information */
- private $_outputWriter;
+ /**
+ * @var Configuration
+ */
+ private $configuration;
/**
* Construct a Migration instance
@@ -48,8 +51,8 @@ class Migration
*/
public function __construct(Configuration $configuration)
{
- $this->_configuration = $configuration;
- $this->_outputWriter = $configuration->getOutputWriter();
+ $this->configuration = $configuration;
+ $this->outputWriter = $configuration->getOutputWriter();
}
/**
@@ -75,9 +78,9 @@ public function writeSqlFile($path, $to = null)
{
$sql = $this->getSql($to);
- $from = $this->_configuration->getCurrentVersion();
+ $from = $this->configuration->getCurrentVersion();
if ($to === null) {
- $to = $this->_configuration->getLatestVersion();
+ $to = $this->configuration->getLatestVersion();
}
$string = sprintf("# Doctrine Migration File Generated on %s\n", date('Y-m-d H:m:s'));
@@ -94,7 +97,7 @@ public function writeSqlFile($path, $to = null)
$path = $path . '/doctrine_migration_' . date('YmdHis') . '.sql';
}
- $this->_outputWriter->write("\n".sprintf('Writing migration file to "<info>%s</info>"', $path));
+ $this->outputWriter->write("\n".sprintf('Writing migration file to "<info>%s</info>"', $path));
return file_put_contents($path, $string);
}
@@ -110,14 +113,14 @@ public function writeSqlFile($path, $to = null)
public function migrate($to = null, $dryRun = false)
{
if ($to === null) {
- $to = $this->_configuration->getLatestVersion();
+ $to = $this->configuration->getLatestVersion();
}
- $from = $this->_configuration->getCurrentVersion();
+ $from = $this->configuration->getCurrentVersion();
$from = (string) $from;
$to = (string) $to;
- $migrations = $this->_configuration->getMigrations();
+ $migrations = $this->configuration->getMigrations();
if ( ! isset($migrations[$to]) && $to > 0) {
throw MigrationException::unknownMigrationVersion($to);
}
@@ -127,12 +130,12 @@ public function migrate($to = null, $dryRun = false)
}
$direction = $from > $to ? 'down' : 'up';
- $migrations = $this->_configuration->getMigrationsToExecute($direction, $to);
+ $migrations = $this->configuration->getMigrationsToExecute($direction, $to);
if ($dryRun === false) {
- $this->_outputWriter->write(sprintf('Migrating <info>%s</info> to <comment>%s</comment> from <comment>%s</comment>', $direction, $to, $from));
+ $this->outputWriter->write(sprintf('Migrating <info>%s</info> to <comment>%s</comment> from <comment>%s</comment>', $direction, $to, $from));
} else {
- $this->_outputWriter->write(sprintf('Executing dry run of migration <info>%s</info> to <comment>%s</comment> from <comment>%s</comment>', $direction, $to, $from));
+ $this->outputWriter->write(sprintf('Executing dry run of migration <info>%s</info> to <comment>%s</comment> from <comment>%s</comment>', $direction, $to, $from));
}
if (empty($migrations)) {
@@ -147,10 +150,10 @@ public function migrate($to = null, $dryRun = false)
$time += $version->getTime();
}
- $this->_outputWriter->write("\n <comment>------------------------</comment>\n");
- $this->_outputWriter->write(sprintf(" <info>++</info> finished in %s", $time));
- $this->_outputWriter->write(sprintf(" <info>++</info> %s migrations executed", count($migrations)));
- $this->_outputWriter->write(sprintf(" <info>++</info> %s sql queries", count($sql, true) - count($sql)));
+ $this->outputWriter->write("\n <comment>------------------------</comment>\n");
+ $this->outputWriter->write(sprintf(" <info>++</info> finished in %s", $time));
+ $this->outputWriter->write(sprintf(" <info>++</info> %s migrations executed", count($migrations)));
+ $this->outputWriter->write(sprintf(" <info>++</info> %s sql queries", count($sql, true) - count($sql)));
return $sql;
}
View
3  vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/MigrationException.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -27,7 +25,6 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
class MigrationException extends \Exception
View
9 vendor/doctrine-migrations/lib/Doctrine/DBAL/Migrations/OutputWriter.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -27,19 +25,18 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
class OutputWriter
{
- private $_closure;
+ private $closure;
public function __construct(\Closure $closure = null)
{
if ($closure === null) {
$closure = function($message) {};
}
- $this->_closure = $closure;
+ $this->closure = $closure;
}
/**
@@ -49,7 +46,7 @@ public function __construct(\Closure $closure = null)
*/
public function write($message)
{
- $closure = $this->_closure;
+ $closure = $this->closure;
$closure($message);
}
}
View
23 ...octrine-migrations/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/AbstractCommand.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -38,12 +36,14 @@
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.doctrine-project.org
* @since 2.0
- * @version $Revision$
* @author Jonathan Wage <jonwage@gmail.com>
*/
abstract class AbstractCommand extends Command
{
- protected $_configuration;
+ /**
+ * @var Configuration
+ */
+ private $configuration;
protected function configure()
{
@@ -51,7 +51,7 @@ protected function configure()
$this->addOption('db-configuration', null, InputOption::VALUE_OPTIONAL, 'The path to a database connection configuration file.');
}
- protected function _outputHeader(Configuration $configuration, OutputInterface $output)
+ protected function outputHeader(Configuration $configuration, OutputInterface $output)
{
$name = $configuration->getName();
$name = $name ? $name : 'Doctrine Database Migrations';
@@ -62,14 +62,19 @@ protected function _outputHeader(Configuration $configuration, OutputInterface $
$output->writeln('');
}
+ public function setMigrationConfiguration(Configuration $config)
+ {
+ $this->configuration = $config;
+ }
+
/**
* @param InputInterface $input
* @param OutputInterface $output
* @return Configuration
*/
- protected function _getMigrationConfiguration(InputInterface $input, OutputInterface $output)
+ protected function getMigrationConfiguration(InputInterface $input, OutputInterface $output)
{
- if ( ! $this->_configuration) {
+ if ( ! $this->configuration) {
$outputWriter = new OutputWriter(function($message) use ($output) {
return $output->writeln($message);
});
@@ -110,8 +115,8 @@ protected function _getMigrationConfiguration(InputInterface $input, OutputInter
} else {
$configuration = new Configuration($conn, $outputWriter);
}
- $this->_configuration = $configuration;