Permalink
Browse files

Switching to Symfony-RC6

  • Loading branch information...
1 parent 91ca410 commit aecab0f0d0840f74f9f4f367a8be6e10cfe16815 @arghav arghav committed Jul 25, 2011
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -36,57 +36,21 @@
}
ClassCollectionLoader::load(array(
+ 'Symfony\\Component\\DependencyInjection\\ContainerAwareInterface',
+ // Cannot be included because annotations will parse the big compiled class file
+ //'Symfony\\Component\\DependencyInjection\\ContainerAware',
'Symfony\\Component\\DependencyInjection\\ContainerInterface',
'Symfony\\Component\\DependencyInjection\\Container',
-
- 'Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface',
- 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle',
- 'Symfony\\Component\\HttpKernel\\Debug\\ErrorHandler',
'Symfony\\Component\\HttpKernel\\HttpKernelInterface',
- 'Symfony\\Component\\HttpKernel\\HttpKernel',
'Symfony\\Component\\HttpKernel\\KernelInterface',
'Symfony\\Component\\HttpKernel\\Kernel',
-
- 'Symfony\\Component\\HttpFoundation\\ParameterBag',
- 'Symfony\\Component\\HttpFoundation\\FileBag',
- 'Symfony\\Component\\HttpFoundation\\ServerBag',
- 'Symfony\\Component\\HttpFoundation\\HeaderBag',
- 'Symfony\\Component\\HttpFoundation\\Request',
- 'Symfony\\Component\\HttpFoundation\\ApacheRequest',
-
'Symfony\\Component\\ClassLoader\\ClassCollectionLoader',
'Symfony\\Component\\ClassLoader\\UniversalClassLoader',
- 'Symfony\\Component\\ClassLoader\\MapFileClassLoader',
-
+ 'Symfony\\Component\\HttpKernel\\Bundle\\Bundle',
+ 'Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface',
'Symfony\\Component\\Config\\ConfigCache',
-), dirname($file), basename($file, '.php.cache'), false, false, '.php.cache');
-
-file_put_contents($file, "<?php\n\nnamespace { require_once __DIR__.'/autoload.php'; }\n\n".substr(file_get_contents($file), 5));
-
-$file = $baseDir.'/app/bootstrap_cache.php.cache';
-if (file_exists($file)) {
- unlink($file);
-}
-
-ClassCollectionLoader::load(array(
- 'Symfony\\Component\\HttpKernel\\KernelInterface',
- 'Symfony\\Component\\HttpKernel\\Kernel',
- 'Symfony\\Component\\HttpKernel\\HttpKernelInterface',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\HttpCache',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\StoreInterface',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\Store',
- 'Symfony\\Component\\HttpKernel\\HttpCache\\Esi',
-
- 'Symfony\\Component\\HttpFoundation\\ParameterBag',
- 'Symfony\\Component\\HttpFoundation\\FileBag',
- 'Symfony\\Component\\HttpFoundation\\ServerBag',
- 'Symfony\\Component\\HttpFoundation\\HeaderBag',
- 'Symfony\\Component\\HttpFoundation\\Request',
- 'Symfony\\Component\\HttpFoundation\\ApacheRequest',
- 'Symfony\\Component\\HttpFoundation\\ResponseHeaderBag',
- 'Symfony\\Component\\HttpFoundation\\Response',
-
- 'Symfony\\Component\\ClassLoader\\UniversalClassLoader',
+ // cannot be included as commands are discovered based on the path to this class via Reflection
+ //'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle',
), dirname($file), basename($file, '.php.cache'), false, false, '.php.cache');
file_put_contents($file, "<?php\n\nnamespace { require_once __DIR__.'/autoload.php'; }\n\n".substr(file_get_contents($file), 5));
@@ -20,4 +20,9 @@ public function getDefaultOptions(array $options)
'data_class' => 'Knp\IpsumBundle\Form\Model\Contact',
);
}
+
+ public function getName()
+ {
+ return 'knpipsumbundle_contact';
+ }
}
Submodule behat updated 76 files
+35 −0 CHANGES.md
+1 −1 features/annotations/arguments.feature
+1 −1 features/annotations/context.feature
+1 −1 features/annotations/definitions_translations.feature
+1 −1 features/annotations/hooks.feature
+1 −1 features/annotations/html.feature
+4 −4 features/annotations/i18n.feature
+1 −1 features/annotations/names.feature
+1 −1 features/annotations/outlines.feature
+4 −4 features/annotations/pretty.feature
+1 −1 features/annotations/profiles.feature
+19 −19 features/annotations/result_types.feature
+237 −0 features/annotations/steps_chaining.feature
+1 −1 features/annotations/tags.feature
+1 −1 features/annotations/transformations.feature
+5 −5 features/bootstrap/BaseFeaturesContext.php
+13 −13 features/bootstrap/FeatureContext.php
+1 −1 features/bootstrap/Hooks.php
+1 −1 features/closures/arguments.feature
+1 −1 features/closures/definitions_translations.feature
+1 −1 features/closures/environment.feature
+1 −1 features/closures/hooks.feature
+1 −1 features/closures/html.feature
+4 −4 features/closures/i18n.feature
+1 −1 features/closures/instep_call.feature
+1 −1 features/closures/names.feature
+1 −1 features/closures/outlines.feature
+3 −3 features/closures/pretty.feature
+1 −1 features/closures/profiles.feature
+14 −14 features/closures/result_types.feature
+1 −1 features/closures/tags.feature
+1 −1 features/closures/transformations.feature
+69 −0 src/Behat/Behat/Annotation/Annotation.php
+1 −1 src/Behat/Behat/Compiler/PearCompiler.php
+118 −0 src/Behat/Behat/Console/Command/BaseCommand.php
+45 −568 src/Behat/Behat/Console/Command/BehatCommand.php
+89 −0 src/Behat/Behat/Console/Input/InputDefinition.php
+74 −0 src/Behat/Behat/Console/Processor/ContainerProcessor.php
+43 −0 src/Behat/Behat/Console/Processor/ContextProcessor.php
+191 −0 src/Behat/Behat/Console/Processor/FormatProcessor.php
+61 −0 src/Behat/Behat/Console/Processor/GherkinProcessor.php
+64 −0 src/Behat/Behat/Console/Processor/HelpProcessor.php
+147 −0 src/Behat/Behat/Console/Processor/InitProcessor.php
+50 −0 src/Behat/Behat/Console/Processor/LocatorProcessor.php
+40 −0 src/Behat/Behat/Console/Processor/ProcessorInterface.php
+50 −0 src/Behat/Behat/Console/Processor/RerunProcessor.php
+6 −7 src/Behat/Behat/Context/BehatContext.php
+2 −2 src/Behat/Behat/Context/ContextInterface.php
+12 −2 src/Behat/Behat/Context/Loader/AnnotatedContextLoader.php
+50 −0 src/Behat/Behat/Context/Step/Given.php
+26 −0 src/Behat/Behat/Context/Step/SubstepInterface.php
+50 −0 src/Behat/Behat/Context/Step/Then.php
+50 −0 src/Behat/Behat/Context/Step/When.php
+28 −1 src/Behat/Behat/DataCollector/RerunDataCollector.php
+9 −9 src/Behat/Behat/Definition/Annotation/Definition.php
+1 −4 src/Behat/Behat/Definition/Annotation/Transformation.php
+8 −8 src/Behat/Behat/Definition/DefinitionDispatcher.php
+1 −1 src/Behat/Behat/Definition/Loader/ClosuredDefinitionLoader.php
+1 −1 src/Behat/Behat/Definition/Proposal/AnnotatedDefinitionProposal.php
+1 −1 src/Behat/Behat/Definition/Proposal/ClosuredDefinitionProposal.php
+13 −2 src/Behat/Behat/DependencyInjection/config/behat.xml
+1 −1 src/Behat/Behat/Exception/AmbiguousException.php
+1 −1 src/Behat/Behat/Exception/ErrorException.php
+1 −1 src/Behat/Behat/Exception/PendingException.php
+1 −1 src/Behat/Behat/Exception/RedundantException.php
+1 −1 src/Behat/Behat/Exception/UndefinedException.php
+7 −0 src/Behat/Behat/Formatter/FormatterInterface.php
+9 −1 src/Behat/Behat/Formatter/HtmlFormatter.php
+27 −7 src/Behat/Behat/Formatter/JUnitFormatter.php
+12 −3 src/Behat/Behat/Formatter/PrettyFormatter.php
+11 −3 src/Behat/Behat/Formatter/ProgressFormatter.php
+15 −4 src/Behat/Behat/HelpPrinter/DefinitionsPrinter.php
+1 −8 src/Behat/Behat/Hook/Annotation/ScenarioHook.php
+1 −8 src/Behat/Behat/Hook/Annotation/StepHook.php
+48 −16 src/Behat/Behat/Tester/StepTester.php
+1 −1 vendor/Gherkin
Submodule mink updated 53 files
+1 −1 .gitmodules
+27 −0 CHANGES.md
+12 −29 README.md
+2 −1 behat.yml
+280 −107 src/Behat/Mink/Behat/Context/MinkContext.php
+1 −1 src/Behat/Mink/Behat/Context/translations/fr.xliff
+47 −19 src/Behat/Mink/Behat/Context/translations/ja.xliff
+6 −10 src/Behat/Mink/Behat/Context/translations/ru.xliff
+57 −4 src/Behat/Mink/Driver/DriverInterface.php
+122 −36 src/Behat/Mink/Driver/GoutteDriver.php
+112 −36 src/Behat/Mink/Driver/SahiDriver.php
+0 −174 src/Behat/Mink/Element/ActionableElement.php
+3 −153 src/Behat/Mink/Element/DocumentElement.php
+24 −27 src/Behat/Mink/Element/Element.php
+19 −5 src/Behat/Mink/Element/ElementInterface.php
+59 −38 src/Behat/Mink/Element/NodeElement.php
+309 −0 src/Behat/Mink/Element/TraversableElement.php
+7 −0 src/Behat/Mink/Exception/DriverException.php
+56 −0 src/Behat/Mink/Exception/ElementHtmlException.php
+30 −8 src/Behat/Mink/Exception/ElementNotFoundException.php
+34 −0 src/Behat/Mink/Exception/ElementTextException.php
+99 −1 src/Behat/Mink/Exception/Exception.php
+45 −0 src/Behat/Mink/Exception/ExpectationException.php
+33 −0 src/Behat/Mink/Exception/ResponseTextException.php
+4 −4 src/Behat/Mink/Exception/UnsupportedDriverActionException.php
+25 −1 src/Behat/Mink/Mink.php
+135 −0 src/Behat/Mink/PHPUnit/TestCase.php
+3 −3 src/Behat/Mink/Selector/NamedSelector.php
+1 −1 src/Behat/Mink/Selector/SelectorsHandler.php
+43 −0 src/Behat/Mink/Session.php
+0 −214 tests/Behat/Mink/Driver/DriverTest.php
+339 −0 tests/Behat/Mink/Driver/GeneralDriverTest.php
+7 −30 tests/Behat/Mink/Driver/GoutteDriverTest.php
+30 −0 tests/Behat/Mink/Driver/HeadlessDriverTest.php
+97 −0 tests/Behat/Mink/Driver/JavascriptDriverTest.php
+9 −8 tests/Behat/Mink/Driver/SahiDriverTest.php
+1 −1 tests/Behat/Mink/Driver/web-fixtures/advanced_form_post.php
+30 −0 tests/Behat/Mink/Driver/web-fixtures/aria_roles.php
+15 −0 tests/Behat/Mink/Driver/web-fixtures/cookie_page1.php
+12 −0 tests/Behat/Mink/Driver/web-fixtures/cookie_page2.php
+18 −0 tests/Behat/Mink/Driver/web-fixtures/cookie_page3.php
+17 −0 tests/Behat/Mink/Driver/web-fixtures/index.php
+18 −0 tests/Behat/Mink/Driver/web-fixtures/js/jquery-1.6.2-min.js
+127 −0 tests/Behat/Mink/Driver/web-fixtures/js/jquery-ui-1.8.14.custom.min.js
+84 −0 tests/Behat/Mink/Driver/web-fixtures/js_test.php
+7 −0 tests/Behat/Mink/Driver/web-fixtures/json.php
+2 −0 tests/Behat/Mink/Driver/web-fixtures/print_cookies.php
+20 −0 tests/Behat/Mink/Driver/web-fixtures/session_test.php
+37 −85 tests/Behat/Mink/Element/DocumentElementTest.php
+0 −12 tests/Behat/Mink/Element/NodeElementTest.php
+1 −1 vendor/Buzz
+1 −1 vendor/SahiClient
+1 −1 vendor/Symfony/Component/CssSelector
Submodule UserBundle updated 65 files
+0 −3 Command/ActivateUserCommand.php
+4 −7 Command/ChangePasswordCommand.php
+1 −5 Command/CreateUserCommand.php
+0 −3 Command/DeactivateUserCommand.php
+0 −3 Command/DemoteSuperAdminCommand.php
+0 −63 Command/InstallAcesCommand.php
+0 −3 Command/PromoteSuperAdminCommand.php
+4 −4 Controller/GroupController.php
+3 −4 Controller/RegistrationController.php
+14 −6 Controller/SecurityController.php
+2 −4 CouchDocument/UserManager.php
+41 −0 DependencyInjection/Compiler/SecurityEncoderFactoryPass.php
+11 −10 DependencyInjection/Configuration.php
+18 −25 DependencyInjection/FOSUserExtension.php
+0 −1 Document/UserManager.php
+0 −1 Entity/UserManager.php
+11 −0 FOSUserBundle.php
+62 −0 Form/DataTransformer/UsernameToUserTransformer.php
+2 −1 Form/Handler/ChangePasswordFormHandler.php
+1 −1 Form/Handler/GroupFormHandler.php
+3 −2 Form/Handler/ProfileFormHandler.php
+1 −1 Form/Handler/RegistrationFormHandler.php
+3 −3 Form/Handler/ResettingFormHandler.php
+3 −3 Form/Model/ChangePassword.php
+3 −3 Form/Model/CheckPassword.php
+22 −0 Form/Model/ResetPassword.php
+0 −26 Form/ProfileFormType.php
+6 −1 Form/Type/ChangePasswordFormType.php
+6 −1 Form/Type/GroupFormType.php
+58 −0 Form/Type/ProfileFormType.php
+7 −2 Form/Type/RegistrationFormType.php
+6 −1 Form/Type/ResettingFormType.php
+43 −0 Form/Type/UsernameFormType.php
+59 −12 Model/User.php
+179 −0 Model/UserInterface.php
+0 −1 Model/UserManager.php
+1 −6 Model/UserManagerInterface.php
+2 −0 README.markdown
+5 −5 Resources/config/change_password.xml
+8 −8 Resources/config/group.xml
+6 −5 Resources/config/profile.xml
+4 −4 Resources/config/registration.xml
+5 −5 Resources/config/resetting.xml
+1 −3 Resources/config/security.xml
+20 −0 Resources/config/username_form_type.xml
+0 −3 Resources/config/util.xml
+21 −26 Resources/config/validation.xml
+129 −93 Resources/doc/index.rst
+11 −12 Resources/translations/FOSUserBundle.da.yml
+16 −17 Resources/translations/FOSUserBundle.de.yml
+11 −11 Resources/translations/FOSUserBundle.en.yml
+12 −7 Resources/translations/FOSUserBundle.es.yml
+14 −7 Resources/translations/FOSUserBundle.et.yml
+1 −0 Resources/translations/FOSUserBundle.fr.yml
+85 −0 Resources/translations/FOSUserBundle.lb.yml
+11 −12 Resources/translations/FOSUserBundle.nl.yml
+11 −12 Resources/translations/FOSUserBundle.pl.yml
+85 −0 Resources/translations/FOSUserBundle.ru.yml
+5 −1 Resources/views/Registration/checkEmail.html.twig
+5 −3 Resources/views/Registration/confirmed.html.twig
+25 −24 Tests/DependencyInjection/FOSUserExtensionTest.php
+0 −67 Tests/Util/AceManagerTest.php
+0 −9 UPDADE.md
+25 −0 UPDATE.md
+0 −82 Util/AceManager.php
Submodule monolog updated 35 files
+16 −0 CHANGELOG.mdown
+3 −0 README.mdown
+1 −1 composer.json
+4 −0 src/Monolog/Formatter/LineFormatter.php
+15 −3 src/Monolog/Formatter/WildfireFormatter.php
+6 −2 src/Monolog/Handler/AbstractHandler.php
+0 −10 src/Monolog/Handler/AbstractProcessingHandler.php
+3 −0 src/Monolog/Handler/FirePHPHandler.php
+10 −7 src/Monolog/Handler/TestHandler.php
+16 −7 src/Monolog/Logger.php
+58 −0 src/Monolog/Processor/IntrospectionProcessor.php
+40 −0 src/Monolog/Processor/MemoryPeakUsageProcessor.php
+50 −0 src/Monolog/Processor/MemoryProcessor.php
+40 −0 src/Monolog/Processor/MemoryUsageProcessor.php
+25 −4 src/Monolog/Processor/WebProcessor.php
+20 −10 tests/Monolog/Formatter/JsonFormatterTest.php
+5 −2 tests/Monolog/Formatter/LineFormatterTest.php
+3 −0 tests/Monolog/Formatter/WildfireFormatterTest.php
+63 −13 tests/Monolog/Handler/AbstractHandlerTest.php
+72 −0 tests/Monolog/Handler/AbstractProcessingHandlerTest.php
+14 −0 tests/Monolog/Handler/BufferHandlerTest.php
+32 −1 tests/Monolog/Handler/FingersCrossedHandlerTest.php
+3 −0 tests/Monolog/Handler/FirePHPHandlerTest.php
+28 −0 tests/Monolog/Handler/GroupHandlerTest.php
+9 −1 tests/Monolog/Handler/MailHandlerTest.php
+3 −0 tests/Monolog/Handler/NullHandlerTest.php
+3 −0 tests/Monolog/Handler/RotatingFileHandlerTest.php
+18 −4 tests/Monolog/Handler/StreamHandlerTest.php
+6 −0 tests/Monolog/Handler/SyslogHandlerTest.php
+54 −0 tests/Monolog/Handler/TestHandlerTest.php
+117 −11 tests/Monolog/LoggerTest.php
+64 −0 tests/Monolog/Processor/IntrospectionProcessorTest.php
+29 −0 tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php
+29 −0 tests/Monolog/Processor/MemoryUsageProcessorTest.php
+39 −0 tests/Monolog/Processor/WebProcessorTest.php
Submodule symfony updated 397 files
View
@@ -2,7 +2,6 @@
require_once __DIR__.'/../app/bootstrap.php.cache';
require_once __DIR__.'/../app/AppKernel.php';
-//require_once __DIR__.'/../app/bootstrap_cache.php.cache';
//require_once __DIR__.'/../app/AppCache.php';
use Symfony\Component\HttpFoundation\Request;

0 comments on commit aecab0f

Please sign in to comment.