Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

upgraded Symfony to Version 2.4

  • Loading branch information...
commit c3cb91faf33f048622c2bf49a7283159a6cd67fc 1 parent ffe972f
@raystorm authored
View
207 .idea/SymfonyResume.iml
@@ -51,28 +51,30 @@
<excludeFolder url="file://$MODULE_DIR$/Symfony/vendor/zendframework/zend-validator" />
<excludeFolder url="file://$MODULE_DIR$/Symfony/vendor/zendframework/zend-version" />
<excludeFolder url="file://$MODULE_DIR$/Symfony/vendor/zendframework/zendservice-livedocx" />
- <excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/alchemy/zippy" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/braincrafted/bootstrap-bundle" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/composer" />
+ <excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/annotations" />
+ <excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/cache" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/collections" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/common" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/dbal" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/doctrine-bundle" />
+ <excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/inflector" />
+ <excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/lexer" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/orm" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/ferdynator/phpword" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/lightopenid" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/openid-bundle" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/friendsofsymfony/user-bundle" />
- <excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/guzzle/guzzle" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/incenteev/composer-parameter-handler" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/jdorn/sql-formatter" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/jquery/jquery" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/kriswallsmith/assetic" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/leafo/lessphp" />
+ <excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/lightopenid/lightopenid" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/monolog/monolog" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/openid/php-openid" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/phpword/phpword" />
- <excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/pimple/pimple" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/distribution-bundle" />
<excludeFolder url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/framework-extra-bundle" />
@@ -123,209 +125,108 @@
<library name="PHP">
<CLASSES>
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-eventmanager" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zendservice-livedocx" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-version" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/collections" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-uri" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/incenteev/composer-parameter-handler" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/collections" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-config" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/generator-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/common" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/lightopenid/lightopenid" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twitter/bootstrap" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/orm" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/swiftmailer/swiftmailer" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/monolog/monolog" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/inflector" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jquery/jquery" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/monolog-bundle" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-code" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-validator" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-stdlib" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/composer" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-http" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/cache" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/swiftmailer-bundle" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/annotations" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-loader" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/leafo/lessphp" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zendservice-livedocx" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/incenteev/composer-parameter-handler" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/generator-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/distribution-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-server" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-escaper" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/symfony" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-escaper" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-server" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jdorn/sql-formatter" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/lexer" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/psr/log" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twitter/bootstrap" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-log" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/orm" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/braincrafted/bootstrap-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twig/twig" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-debug" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/framework-extra-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/icu" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/framework-extra-bundle" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-debug" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twig/extensions" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/dbal" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/ferdynator/phpword" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/swiftmailer/swiftmailer" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/alchemy/zippy" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/monolog/monolog" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/dbal" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/doctrine-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/guzzle/guzzle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/monolog-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jquery/jquery" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-code" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-soap" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-validator" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/kriswallsmith/assetic" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-stdlib" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/composer" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/lightopenid" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-http" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/pimple/pimple" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/assetic-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/swiftmailer-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-servicemanager" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-loader" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/openid-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/leafo/lessphp" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-eventmanager" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zendservice-livedocx" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-version" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/collections" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-uri" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/incenteev/composer-parameter-handler" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/collections" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-config" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/generator-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/common" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/distribution-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-server" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-escaper" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/symfony" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jdorn/sql-formatter" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/psr/log" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/lightopenid/lightopenid" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twitter/bootstrap" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-log" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/orm" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/braincrafted/bootstrap-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twig/twig" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-debug" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/framework-extra-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/icu" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twig/extensions" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/dbal" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/ferdynator/phpword" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/swiftmailer/swiftmailer" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/alchemy/zippy" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/monolog/monolog" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/doctrine-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/guzzle/guzzle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/monolog-bundle" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/inflector" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jquery/jquery" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/monolog-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-code" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-soap" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-validator" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/kriswallsmith/assetic" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-stdlib" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/composer" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/lightopenid" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-http" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/pimple/pimple" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/assetic-bundle" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/cache" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/swiftmailer-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-servicemanager" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/annotations" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-loader" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/openid-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/leafo/lessphp" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Composer Vendors">
- <CLASSES>
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/lightopenid" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/openid-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/psr/log" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twig/twig" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twig/extensions" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jdorn/sql-formatter" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/leafo/lessphp" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/guzzle/guzzle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jquery/jquery" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/pimple/pimple" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zendservice-livedocx" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/incenteev/composer-parameter-handler" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/generator-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/distribution-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/framework-extra-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/alchemy/zippy" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/monolog/monolog" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/icu" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/symfony" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/assetic-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/monolog-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/swiftmailer-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twitter/bootstrap" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/composer" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/orm" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/dbal" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/common" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/collections" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/doctrine-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/incenteev/composer-parameter-handler" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/ferdynator/phpword" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/swiftmailer/swiftmailer" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/braincrafted/bootstrap-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/kriswallsmith/assetic" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-log" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-uri" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-code" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-http" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-soap" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-debug" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-config" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-loader" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-server" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-stdlib" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-escaper" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-version" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-validator" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-eventmanager" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-servicemanager" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zendservice-livedocx" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/lightopenid" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/openid-bundle" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-server" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jdorn/sql-formatter" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/lexer" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/psr/log" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-log" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/braincrafted/bootstrap-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twig/twig" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twig/extensions" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jdorn/sql-formatter" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/leafo/lessphp" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/guzzle/guzzle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/jquery/jquery" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/pimple/pimple" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/generator-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/distribution-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/framework-extra-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/alchemy/zippy" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/monolog/monolog" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/icu" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/symfony" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/assetic-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/monolog-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/swiftmailer-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twitter/bootstrap" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/composer" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/orm" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/sensio/framework-extra-bundle" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-debug" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/twig/extensions" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/ferdynator/phpword" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/dbal" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/common" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/collections" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/doctrine/doctrine-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/incenteev/composer-parameter-handler" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/ferdynator/phpword" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/swiftmailer/swiftmailer" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/braincrafted/bootstrap-bundle" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/kriswallsmith/assetic" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-log" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-uri" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-code" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-http" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-soap" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-debug" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-config" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-loader" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-server" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-stdlib" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-escaper" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-version" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-validator" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-eventmanager" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/kriswallsmith/assetic" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/lightopenid" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/symfony/assetic-bundle" />
<root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zend-servicemanager" />
- <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/zendframework/zendservice-livedocx" />
+ <root url="file://$MODULE_DIR$/framework-standard-edition/vendor/fp/openid-bundle" />
</SOURCES>
</library>
</orderEntry>
View
324 .idea/workspace.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="b7e7e79c-ca57-4480-96bf-5225ae37049c" name="Default" comment="readme.md - updated with link for PHPLiveDocX&#10;removed Unnecessary default files.&#10;Added Necessary config files.&#10;Added Base html template&#10;">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/framework-standard-edition/app/bootstrap.php.cache" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/framework-standard-edition/.gitignore" afterPath="$PROJECT_DIR$/framework-standard-edition/.gitignore" />
+ <list default="true" id="b7e7e79c-ca57-4480-96bf-5225ae37049c" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/framework-standard-edition/app/SymfonyRequirements.php" afterPath="$PROJECT_DIR$/framework-standard-edition/app/SymfonyRequirements.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/SymfonyResume.iml" afterPath="$PROJECT_DIR$/.idea/SymfonyResume.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/framework-standard-edition/app/bootstrap.php.cache" afterPath="$PROJECT_DIR$/framework-standard-edition/app/bootstrap.php.cache" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/framework-standard-edition/app/check.php" afterPath="$PROJECT_DIR$/framework-standard-edition/app/check.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/codeStyleSettings.xml" afterPath="$PROJECT_DIR$/.idea/codeStyleSettings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/framework-standard-edition/composer.json" afterPath="$PROJECT_DIR$/framework-standard-edition/composer.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/framework-standard-edition/composer.lock" afterPath="$PROJECT_DIR$/framework-standard-edition/composer.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
@@ -18,7 +21,6 @@
</list>
<ignored path="SymfonyResume.iws" />
<ignored path=".idea/workspace.xml" />
- <file path="/Dummy.txt" changelist="b7e7e79c-ca57-4480-96bf-5225ae37049c" time="1390549093549" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -86,16 +88,25 @@
<file leaf-file-name=".gitignore" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/framework-standard-edition/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="0" selection-start="111" selection-end="111" vertical-scroll-proportion="0.0">
+ <state line="7" column="0" selection-start="89" selection-end="89" vertical-scroll-proportion="0.0" vertical-offset="119" max-vertical-offset="255">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="composer.json" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="composer.json" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/framework-standard-edition/composer.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="0" selection-start="2963" selection-end="2963" vertical-scroll-proportion="0.6612319">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="1360">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="upgrade.json" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/framework-standard-edition/upgrade.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="15" column="59" selection-start="719" selection-end="719" vertical-scroll-proportion="0.24107143" vertical-offset="39" max-vertical-offset="935">
<folding />
</state>
</provider>
@@ -170,15 +181,14 @@
<option value="$PROJECT_DIR$/tmp.txt" />
<option value="$USER_HOME$/.m2/settings.xml" />
<option value="$PROJECT_DIR$/framework-standard-edition/.gitignore" />
+ <option value="$PROJECT_DIR$/framework-standard-edition/upgrade.json" />
</list>
</option>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP">
<include_path>
- <path value="$PROJECT_DIR$/framework-standard-edition/vendor/alchemy/zippy" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/zendframework/zendservice-livedocx" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/swiftmailer/swiftmailer" />
- <path value="$PROJECT_DIR$/framework-standard-edition/vendor/pimple/pimple" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/psr/log" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/symfony/assetic-bundle" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/symfony/icu" />
@@ -202,7 +212,6 @@
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/fp/openid-bundle" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/zendframework/zend-loader" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/zendframework/zend-http" />
- <path value="$PROJECT_DIR$/framework-standard-edition/vendor/guzzle/guzzle" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/zendframework/zend-code" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/ferdynator/phpword" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/zendframework/zend-debug" />
@@ -223,6 +232,11 @@
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/zendframework/zend-soap" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/doctrine/collections" />
<path value="$PROJECT_DIR$/framework-standard-edition/vendor/zendframework/zend-servicemanager" />
+ <path value="$PROJECT_DIR$/framework-standard-edition/vendor/doctrine/annotations" />
+ <path value="$PROJECT_DIR$/framework-standard-edition/vendor/doctrine/cache" />
+ <path value="$PROJECT_DIR$/framework-standard-edition/vendor/doctrine/lexer" />
+ <path value="$PROJECT_DIR$/framework-standard-edition/vendor/doctrine/inflector" />
+ <path value="$PROJECT_DIR$/framework-standard-edition/vendor/lightopenid/lightopenid" />
</include_path>
</component>
<component name="ProjectFrameBounds">
@@ -274,6 +288,7 @@
</navigator>
<panes>
<pane id="Scope" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -320,24 +335,89 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="vendor" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SymfonyResume" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SymfonyResume" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="framework-standard-edition" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="vendor" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="fp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="openid-bundle" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SymfonyResume" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SymfonyResume" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="framework-standard-edition" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="vendor" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="fp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SymfonyResume" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="SymfonyResume" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="framework-standard-edition" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
- <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="project.structure.last.edited" value="Facets" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="298" />
- <property name="project.structure.proportion" value="0.0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="298" />
+ <property name="project.structure.proportion" value="0.0" />
<property name="options.splitter.main.proportions" value="0.3" />
- <property name="recentsLimit" value="5" />
- <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth0" value="298" />
+ <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
+ <property name="recentsLimit" value="5" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/.." />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="298" />
@@ -356,8 +436,8 @@
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
<property name="options.lastSelected" value="preferences.pluginManager" />
- <property name="project.structure.side.proportion" value="0.2" />
<property name="DefaultHtmlFileTemplate" value="Html5" />
+ <property name="project.structure.side.proportion" value="0.2" />
<property name="restartRequiresConfirmation" value="true" />
<property name="options.searchVisible" value="true" />
</component>
@@ -385,7 +465,7 @@
<recent name="C:\Users\tfburton\Documents\private\SymfonyResume\framework-standard-edition\src\TBurton\ResumeBundle\Controller" />
</key>
</component>
- <component name="RunManager" selected="PHP Script.check.php">
+ <component name="RunManager" selected="PHP Script.Internel Web Server">
<configuration default="false" name="check.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/framework-standard-edition/app/check.php">
<RunnerSettings RunnerId="PhpRunner" />
<ConfigurationWrapper RunnerId="PhpRunner" />
@@ -430,7 +510,10 @@
<configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
<method />
</configuration>
- <configuration default="true" type="CBConfiguration" factoryName="Local">
+ <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true">
+ <method />
+ </configuration>
+ <configuration default="true" type="CBConfiguration" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false">
<deployment />
<server-settings>
<option name="HTTP_PORT_X" value="8080" />
@@ -504,18 +587,6 @@
<configuration default="true" type="PhpRemoteDebugRunConfigurationType" factoryName="PHP Remote Debug">
<method />
</configuration>
- <configuration default="true" type="CBConfiguration" factoryName="Remote">
- <option name="PORT" value="80" />
- <option name="LOCAL" value="false" />
- <deployment />
- <server-settings>
- <option name="USERNAME" value="" />
- <option name="PASSWORD" value="" />
- </server-settings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Run" />
- <method />
- </configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" />
@@ -537,10 +608,24 @@
<option name="CONTEXT_PROVIDER" />
<method />
</configuration>
- <configuration default="false" name="Test" type="CBConfiguration" factoryName="Remote" APPLICATION_SERVER_NAME="CloudBees">
+ <configuration default="false" name="Internel Web Server" type="PhpLocalRunConfigurationType" factoryName="PHP Console" path="$PROJECT_DIR$/framework-standard-edition/app/console" scriptParameters="server:run">
+ <CommandLine workingDirectory="$PROJECT_DIR$/framework-standard-edition/" />
+ <RunnerSettings RunnerId="PhpRunner" />
+ <ConfigurationWrapper RunnerId="PhpRunner" />
+ <method />
+ </configuration>
+ <list size="2">
+ <item index="0" class="java.lang.String" itemvalue="PHP Script.Internel Web Server" />
+ <item index="1" class="java.lang.String" itemvalue="PHP Script.check.php" />
+ </list>
+ <recent_temporary>
+ <list size="1">
+ <item index="0" class="java.lang.String" itemvalue="PHP Script.check.php" />
+ </list>
+ </recent_temporary>
+ <configuration default="true" type="CBConfiguration" factoryName="Remote">
<option name="PORT" value="80" />
<option name="LOCAL" value="false" />
- <option name="OPEN_IN_BROWSER_URL" value="http://test.raystorm.cloudbees.net/" />
<deployment />
<server-settings>
<option name="USERNAME" value="" />
@@ -550,22 +635,19 @@
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
- <configuration default="false" name="Internel Web Server" type="PhpLocalRunConfigurationType" factoryName="PHP Console" path="$PROJECT_DIR$/framework-standard-edition/app/console" scriptParameters="server:run">
- <CommandLine workingDirectory="$PROJECT_DIR$/framework-standard-edition/" />
- <RunnerSettings RunnerId="PhpRunner" />
- <ConfigurationWrapper RunnerId="PhpRunner" />
+ <configuration default="false" name="Test" type="CBConfiguration" factoryName="Remote" APPLICATION_SERVER_NAME="CloudBees">
+ <option name="PORT" value="80" />
+ <option name="LOCAL" value="false" />
+ <option name="OPEN_IN_BROWSER_URL" value="http://test.raystorm.cloudbees.net/" />
+ <deployment />
+ <server-settings>
+ <option name="USERNAME" value="" />
+ <option name="PASSWORD" value="" />
+ </server-settings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
- <list size="3">
- <item index="0" class="java.lang.String" itemvalue="CloudBees Server.Test" />
- <item index="1" class="java.lang.String" itemvalue="PHP Script.Internel Web Server" />
- <item index="2" class="java.lang.String" itemvalue="PHP Script.check.php" />
- </list>
- <recent_temporary>
- <list size="1">
- <item index="0" class="java.lang.String" itemvalue="PHP Script.check.php" />
- </list>
- </recent_temporary>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="all">
@@ -593,6 +675,7 @@
<updated>1373179901997</updated>
<workItem from="1390547295683" duration="118000" />
<workItem from="1390547700959" duration="135000" />
+ <workItem from="1390644119008" duration="3042000" />
</task>
<task id="LOCAL-00001" summary="Initial Commit&#10;">
<created>1376287644900</created>
@@ -622,11 +705,15 @@
<created>1390387146049</created>
<updated>1390387146049</updated>
</task>
- <option name="localTasksCounter" value="8" />
+ <task id="LOCAL-00008" summary="Added bootstrap.php.cache - necessary symfony config class&#10;updated .gitignore to allow it.">
+ <created>1390549410358</created>
+ <updated>1390549410358</updated>
+ </task>
+ <option name="localTasksCounter" value="9" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="253000" />
+ <option name="totallyTimeSpent" value="3295000" />
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
@@ -652,27 +739,27 @@
<frame x="-8" y="-8" width="1936" height="1056" extended-state="0" />
<editor active="true" />
<layout>
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32814237" sideWeight="0.398524" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32805908" sideWeight="0.398524" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.601476" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="CDI" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998884" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15603584" sideWeight="0.6718576" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3548387" sideWeight="0.49920928" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15572916" sideWeight="0.6718576" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.35443038" sideWeight="0.49920928" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="CDI" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3737486" sideWeight="0.49973643" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998884" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@@ -690,58 +777,9 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
- <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
- <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
- <option name="CHECK_NEW_TODO" value="true" />
<option name="myTodoPanelSettings">
- <value>
- <are-packages-shown value="false" />
- <are-modules-shown value="false" />
- <flatten-packages value="false" />
- <is-autoscroll-to-source value="false" />
- </value>
+ <TodoPanelSettings />
</option>
- <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
- <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
- <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
- <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
- <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
- <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
- <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
- <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
- <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
- <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
- <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
- <option name="SHORT_DIFF_HORIZONTALLY" value="true" />
- <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
- <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
- <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
- <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
- <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
- <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
- <option name="SHOW_DIRTY_RECURSIVELY" value="false" />
- <option name="LIMIT_HISTORY" value="true" />
- <option name="MAXIMUM_HISTORY_ROWS" value="1000" />
- <option name="UPDATE_FILTER_SCOPE_NAME" />
- <option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
- <option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
- <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
- <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="readme.md - updated with link for PHPLiveDocX&#10;removed Unnecessary default files.&#10;Added Necessary config files.&#10;Added Base html template" />
- <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
- <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
- <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
- <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
- <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
- <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
- <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
- <option name="ACTIVE_VCS_NAME" />
- <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
- <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
- <option name="UPDATE_FILTER_BY_SCOPE" value="false" />
- <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
- <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="Initial Commit&#10;" />
<MESSAGE value="First Working Version&#10; - supports File Upload&#10; - resume Conversion via LiveDocx&#10; - Supports OpenId Login&#10; - still needs actual security" />
<MESSAGE value="Customize the Login page&#10; + friendly URL&#10; + alternate URLs for completeness/ease of use&#10; + buttons for google/yahoo&#10; + Added BonBon Button CSS to make the buttons look nice.&#10;Locked down the Admin page to Admins only&#10;Updated OpenIdUser and OpenIdUserManager to get the known admin emails from parameters.yml&#10;Corrected the debugging User display on the index page&#10;removed the Symfony form code from navBar in favor of a plain html form.(button)&#10;&#10; &#10;" />
@@ -750,6 +788,8 @@
<MESSAGE value="Add a readme.md file to the project with a brief description" />
<MESSAGE value="Added an Apache V2 License" />
<MESSAGE value="readme.md - updated with link for PHPLiveDocX&#10;removed Unnecessary default files.&#10;Added Necessary config files.&#10;Added Base html template" />
+ <MESSAGE value="Added bootstrap.php.cache - necessary symfony config class&#10;updated .gitignore to allow it." />
+ <option name="LAST_COMMIT_MESSAGE" value="Added bootstrap.php.cache - necessary symfony config class&#10;updated .gitignore to allow it." />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -759,99 +799,131 @@
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/framework-standard-edition/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="0" selection-start="136" selection-end="136" vertical-scroll-proportion="0.0">
+ <state line="9" column="0" selection-start="129" selection-end="129" vertical-scroll-proportion="0.0" vertical-offset="153" max-vertical-offset="272">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/composer.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="63" selection-start="2987" selection-end="2987" vertical-scroll-proportion="0.0">
+ <state line="67" column="0" selection-start="2963" selection-end="2963" vertical-scroll-proportion="0.0" vertical-offset="1139" max-vertical-offset="1326">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="0" selection-start="136" selection-end="136" vertical-scroll-proportion="0.0">
+ <state line="10" column="0" selection-start="136" selection-end="136" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/composer.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="63" selection-start="2987" selection-end="2987" vertical-scroll-proportion="0.0">
+ <state line="68" column="63" selection-start="2987" selection-end="2987" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="10" column="0" selection-start="136" selection-end="136" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/composer.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="63" selection-start="2987" selection-end="2987" vertical-scroll-proportion="0.0">
+ <state line="68" column="63" selection-start="2987" selection-end="2987" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/readme.md">
+ <entry file="file://$PROJECT_DIR$/framework-standard-edition/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="0" selection-start="674" selection-end="674" vertical-scroll-proportion="0.0" />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/LICENSE.txt">
+ <entry file="file://$PROJECT_DIR$/framework-standard-edition/composer.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="24" column="0" selection-start="1176" selection-end="1176" vertical-scroll-proportion="0.0" />
- </provider>
- <provider editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider">
- <state />
+ <state line="68" column="63" selection-start="2987" selection-end="2987" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
+ <folding />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tmp.txt">
+ <entry file="file://$PROJECT_DIR$/readme.md">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="52" selection-start="80" selection-end="80" vertical-scroll-proportion="0.019517796" />
+ <state line="18" column="0" selection-start="674" selection-end="674" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/src/.htaccess">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/README.md">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/UPGRADE.md">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/.travis.yml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/UPGRADE-2.2.md">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="0" selection-start="111" selection-end="111" vertical-scroll-proportion="0.0">
+ <state line="7" column="0" selection-start="89" selection-end="89" vertical-scroll-proportion="0.0" vertical-offset="119" max-vertical-offset="255">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework-standard-edition/composer.json">
<provider selected="true" editor-type-id="text-editor">
- <state line="67" column="0" selection-start="2963" selection-end="2963" vertical-scroll-proportion="0.6612319">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1326">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/LICENSE.txt">
+ <provider editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider">
+ <state />
+ </provider>
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="24" column="0" selection-start="1176" selection-end="1176" vertical-scroll-proportion="0.029010238" vertical-offset="391" max-vertical-offset="3570">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/framework-standard-edition/vendor/fp/openid-bundle/Fp/OpenIdBundle/Resources/config/services.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="57" column="12" selection-start="2758" selection-end="2758" vertical-scroll-proportion="0.83306056" vertical-offset="460" max-vertical-offset="1071">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/tmp.txt">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1" column="96" selection-start="124" selection-end="124" vertical-scroll-proportion="0.027823241" vertical-offset="0" max-vertical-offset="611">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/framework-standard-edition/upgrade.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="15" column="59" selection-start="719" selection-end="719" vertical-scroll-proportion="0.24107143" vertical-offset="39" max-vertical-offset="935">
<folding />
</state>
</provider>
View
246 framework-standard-edition/app/bootstrap.php.cache
@@ -95,7 +95,7 @@ public function getInt($key, $default = 0, $deep = false)
{
return (int) $this->get($key, $default, $deep);
}
-public function filter($key, $default = null, $deep = false, $filter=FILTER_DEFAULT, $options=array())
+public function filter($key, $default = null, $deep = false, $filter = FILTER_DEFAULT, $options = array())
{
$value = $this->get($key, $default, $deep);
if (!is_array($options) && $options) {
@@ -120,12 +120,10 @@ namespace Symfony\Component\HttpFoundation
{
class HeaderBag implements \IteratorAggregate, \Countable
{
-protected $headers;
-protected $cacheControl;
+protected $headers = array();
+protected $cacheControl = array();
public function __construct(array $headers = array())
{
-$this->cacheControl = array();
-$this->headers = array();
foreach ($headers as $key => $values) {
$this->set($key, $values);
}
@@ -368,15 +366,22 @@ $authorizationHeader = $this->parameters['HTTP_AUTHORIZATION'];
} elseif (isset($this->parameters['REDIRECT_HTTP_AUTHORIZATION'])) {
$authorizationHeader = $this->parameters['REDIRECT_HTTP_AUTHORIZATION'];
}
-if ((null !== $authorizationHeader) && (0 === stripos($authorizationHeader,'basic'))) {
+if (null !== $authorizationHeader) {
+if (0 === stripos($authorizationHeader,'basic')) {
$exploded = explode(':', base64_decode(substr($authorizationHeader, 6)));
if (count($exploded) == 2) {
list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded;
}
+} elseif (empty($this->parameters['PHP_AUTH_DIGEST']) && (0 === stripos($authorizationHeader,'digest'))) {
+$headers['PHP_AUTH_DIGEST'] = $authorizationHeader;
+$this->parameters['PHP_AUTH_DIGEST'] = $authorizationHeader;
+}
}
}
if (isset($headers['PHP_AUTH_USER'])) {
$headers['AUTHORIZATION'] ='Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.$headers['PHP_AUTH_PW']);
+} elseif (isset($headers['PHP_AUTH_DIGEST'])) {
+$headers['AUTHORIZATION'] = $headers['PHP_AUTH_DIGEST'];
}
return $headers;
}
@@ -411,6 +416,7 @@ public $headers;
protected $content;
protected $languages;
protected $charsets;
+protected $encodings;
protected $acceptableContentTypes;
protected $pathInfo;
protected $requestUri;
@@ -422,6 +428,7 @@ protected $session;
protected $locale;
protected $defaultLocale ='en';
protected static $formats;
+protected static $requestFactory;
public function __construct(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
{
$this->initialize($query, $request, $attributes, $cookies, $files, $server, $content);
@@ -438,6 +445,7 @@ $this->headers = new HeaderBag($this->server->getHeaders());
$this->content = $content;
$this->languages = null;
$this->charsets = null;
+$this->encodings = null;
$this->acceptableContentTypes = null;
$this->pathInfo = null;
$this->requestUri = null;
@@ -448,7 +456,7 @@ $this->format = null;
}
public static function createFromGlobals()
{
-$request = new static($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
+$request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
if (0 === strpos($request->headers->get('CONTENT_TYPE'),'application/x-www-form-urlencoded')
&& in_array(strtoupper($request->server->get('REQUEST_METHOD','GET')), array('PUT','DELETE','PATCH'))
) {
@@ -506,14 +514,26 @@ $request = array();
$query = $parameters;
break;
}
+$queryString ='';
if (isset($components['query'])) {
parse_str(html_entity_decode($components['query']), $qs);
+if ($query) {
$query = array_replace($qs, $query);
+$queryString = http_build_query($query,'','&');
+} else {
+$query = $qs;
+$queryString = $components['query'];
}
+} elseif ($query) {
$queryString = http_build_query($query,'','&');
+}
$server['REQUEST_URI'] = $components['path'].(''!== $queryString ?'?'.$queryString :'');
$server['QUERY_STRING'] = $queryString;
-return new static($query, $request, array(), $cookies, $files, $server, $content);
+return self::createRequestFromFactory($query, $request, array(), $cookies, $files, $server, $content);
+}
+public static function setFactory($callable)
+{
+self::$requestFactory = $callable;
}
public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
{
@@ -539,6 +559,7 @@ $dup->headers = new HeaderBag($dup->server->getHeaders());
}
$dup->languages = null;
$dup->charsets = null;
+$dup->encodings = null;
$dup->acceptableContentTypes = null;
$dup->pathInfo = null;
$dup->requestUri = null;
@@ -546,8 +567,11 @@ $dup->baseUrl = null;
$dup->basePath = null;
$dup->method = null;
$dup->format = null;
-if (!$dup->get('_format')) {
-$dup->setRequestFormat($this->getRequestFormat());
+if (!$dup->get('_format') && $this->get('_format')) {
+$dup->attributes->set('_format', $this->get('_format'));
+}
+if (!$dup->getRequestFormat(null)) {
+$dup->setRequestFormat($format = $this->getRequestFormat(null));
}
return $dup;
}
@@ -583,7 +607,7 @@ $_SERVER['HTTP_'.$key] = implode(', ', $value);
}
}
$request = array('g'=> $_GET,'p'=> $_POST,'c'=> $_COOKIE);
-$requestOrder = ini_get('request_order') ?: ini_get('variable_order');
+$requestOrder = ini_get('request_order') ?: ini_get('variables_order');
$requestOrder = preg_replace('#[^cgp]#','', strtolower($requestOrder)) ?:'gp';
$_REQUEST = array();
foreach (str_split($requestOrder) as $order) {
@@ -682,12 +706,10 @@ return array($ip);
}
$clientIps = array_map('trim', explode(',', $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_IP])));
$clientIps[] = $ip;
-$trustedProxies = !self::$trustedProxies ? array($ip) : self::$trustedProxies;
$ip = $clientIps[0];
foreach ($clientIps as $key => $clientIp) {
-if (IpUtils::checkIp($clientIp, $trustedProxies)) {
+if (IpUtils::checkIp($clientIp, self::$trustedProxies)) {
unset($clientIps[$key]);
-continue;
}
}
return $clientIps ? array_reverse($clientIps) : array($ip);
@@ -736,6 +758,12 @@ if (self::$trustedHeaders[self::HEADER_CLIENT_PROTO] &&'https'=== $this->headers
return 443;
}
}
+if ($host = $this->headers->get('HOST')) {
+if (false !== $pos = strrpos($host,':')) {
+return intval(substr($host, $pos + 1));
+}
+return'https'=== $this->getScheme() ? 443 : 80;
+}
return $this->server->get('SERVER_PORT');
}
public function getUser()
@@ -794,7 +822,7 @@ return''=== $qs ? null : $qs;
public function isSecure()
{
if (self::$trustedProxies && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
-return in_array(strtolower($proto), array('https','on','1'));
+return in_array(strtolower(current(explode(',', $proto))), array('https','on','ssl','1'));
}
return'on'== strtolower($this->server->get('HTTPS')) || 1 == $this->server->get('HTTPS');
}
@@ -810,7 +838,7 @@ $host = $this->server->get('SERVER_ADDR','');
}
$host = strtolower(preg_replace('/:\d+$/','', trim($host)));
if ($host && !preg_match('/^\[?(?:[a-zA-Z0-9-:\]_]+\.?)+$/', $host)) {
-throw new \UnexpectedValueException('Invalid Host "'.$host.'"');
+throw new \UnexpectedValueException(sprintf('Invalid Host "%s"', $host));
}
if (count(self::$trustedHostPatterns) > 0) {
if (in_array($host, self::$trustedHosts)) {
@@ -822,7 +850,7 @@ self::$trustedHosts[] = $host;
return $host;
}
}
-throw new \UnexpectedValueException('Untrusted Host "'.$host.'"');
+throw new \UnexpectedValueException(sprintf('Untrusted Host "%s"', $host));
}
return $host;
}
@@ -995,6 +1023,13 @@ return $this->charsets;
}
return $this->charsets = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all());
}
+public function getEncodings()
+{
+if (null !== $this->encodings) {
+return $this->encodings;
+}
+return $this->encodings = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all());
+}
public function getAcceptableContentTypes()
{
if (null !== $this->acceptableContentTypes) {
@@ -1058,7 +1093,7 @@ do {
$seg = $segs[$index];
$baseUrl ='/'.$seg.$baseUrl;
++$index;
-} while (($last > $index) && (false !== ($pos = strpos($path, $baseUrl))) && (0 != $pos));
+} while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos);
}
$requestUri = $this->getRequestUri();
if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, $baseUrl)) {
@@ -1068,14 +1103,14 @@ if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, dirn
return rtrim($prefix,'/');
}
$truncatedRequestUri = $requestUri;
-if (($pos = strpos($requestUri,'?')) !== false) {
+if (false !== $pos = strpos($requestUri,'?')) {
$truncatedRequestUri = substr($requestUri, 0, $pos);
}
$basename = basename($baseUrl);
if (empty($basename) || !strpos(rawurldecode($truncatedRequestUri), $basename)) {
return'';
}
-if ((strlen($requestUri) >= strlen($baseUrl)) && ((false !== ($pos = strpos($requestUri, $baseUrl))) && ($pos !== 0))) {
+if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && $pos !== 0) {
$baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
}
return rtrim($baseUrl,'/');
@@ -1107,7 +1142,7 @@ $pathInfo ='/';
if ($pos = strpos($requestUri,'?')) {
$requestUri = substr($requestUri, 0, $pos);
}
-if ((null !== $baseUrl) && (false === ($pathInfo = substr($requestUri, strlen($baseUrl))))) {
+if (null !== $baseUrl && false === $pathInfo = substr($requestUri, strlen($baseUrl))) {
return'/';
} elseif (null === $baseUrl) {
return $requestUri;
@@ -1139,12 +1174,65 @@ return $match[0];
}
return false;
}
+private static function createRequestFromFactory(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
+{
+if (self::$requestFactory) {
+$request = call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content);
+if (!$request instanceof Request) {
+throw new \LogicException('The Request factory must return an instance of Symfony\Component\HttpFoundation\Request.');
+}
+return $request;
+}
+return new static($query, $request, $attributes, $cookies, $files, $server, $content);
+}
}
}
namespace Symfony\Component\HttpFoundation
{
class Response
{
+const HTTP_CONTINUE = 100;
+const HTTP_SWITCHING_PROTOCOLS = 101;
+const HTTP_PROCESSING = 102; const HTTP_OK = 200;
+const HTTP_CREATED = 201;
+const HTTP_ACCEPTED = 202;
+const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
+const HTTP_NO_CONTENT = 204;
+const HTTP_RESET_CONTENT = 205;
+const HTTP_PARTIAL_CONTENT = 206;
+const HTTP_MULTI_STATUS = 207; const HTTP_ALREADY_REPORTED = 208; const HTTP_IM_USED = 226; const HTTP_MULTIPLE_CHOICES = 300;
+const HTTP_MOVED_PERMANENTLY = 301;
+const HTTP_FOUND = 302;
+const HTTP_SEE_OTHER = 303;
+const HTTP_NOT_MODIFIED = 304;
+const HTTP_USE_PROXY = 305;
+const HTTP_RESERVED = 306;
+const HTTP_TEMPORARY_REDIRECT = 307;
+const HTTP_PERMANENTLY_REDIRECT = 308; const HTTP_BAD_REQUEST = 400;
+const HTTP_UNAUTHORIZED = 401;
+const HTTP_PAYMENT_REQUIRED = 402;
+const HTTP_FORBIDDEN = 403;
+const HTTP_NOT_FOUND = 404;
+const HTTP_METHOD_NOT_ALLOWED = 405;
+const HTTP_NOT_ACCEPTABLE = 406;
+const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
+const HTTP_REQUEST_TIMEOUT = 408;
+const HTTP_CONFLICT = 409;
+const HTTP_GONE = 410;
+const HTTP_LENGTH_REQUIRED = 411;
+const HTTP_PRECONDITION_FAILED = 412;
+const HTTP_REQUEST_ENTITY_TOO_LARGE = 413;
+const HTTP_REQUEST_URI_TOO_LONG = 414;
+const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
+const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
+const HTTP_EXPECTATION_FAILED = 417;
+const HTTP_I_AM_A_TEAPOT = 418; const HTTP_UNPROCESSABLE_ENTITY = 422; const HTTP_LOCKED = 423; const HTTP_FAILED_DEPENDENCY = 424; const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425; const HTTP_UPGRADE_REQUIRED = 426; const HTTP_PRECONDITION_REQUIRED = 428; const HTTP_TOO_MANY_REQUESTS = 429; const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431; const HTTP_INTERNAL_SERVER_ERROR = 500;
+const HTTP_NOT_IMPLEMENTED = 501;
+const HTTP_BAD_GATEWAY = 502;
+const HTTP_SERVICE_UNAVAILABLE = 503;
+const HTTP_GATEWAY_TIMEOUT = 504;
+const HTTP_VERSION_NOT_SUPPORTED = 505;
+const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506; const HTTP_INSUFFICIENT_STORAGE = 507; const HTTP_LOOP_DETECTED = 508; const HTTP_NOT_EXTENDED = 510; const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
public $headers;
protected $content;
protected $version;
@@ -1234,7 +1322,7 @@ $headers->set('Content-Type', $mimeType);
$charset = $this->charset ?:'UTF-8';
if (!$headers->has('Content-Type')) {
$headers->set('Content-Type','text/html; charset='.$charset);
-} elseif (0 === strpos($headers->get('Content-Type'),'text/') && false === strpos($headers->get('Content-Type'),'charset')) {
+} elseif (0 === stripos($headers->get('Content-Type'),'text/') && false === stripos($headers->get('Content-Type'),'charset')) {
$headers->set('Content-Type', $headers->get('Content-Type').'; charset='.$charset);
}
if ($headers->has('Transfer-Encoding')) {
@@ -1262,10 +1350,10 @@ public function sendHeaders()
if (headers_sent()) {
return $this;
}
-header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText));
+header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
foreach ($this->headers->allPreserveCase() as $name => $values) {
foreach ($values as $value) {
-header($name.': '.$value, false);
+header($name.': '.$value, false, $this->statusCode);
}
}
foreach ($this->headers->getCookies() as $cookie) {
@@ -1835,23 +1923,17 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
class Container implements IntrospectableContainerInterface
{
protected $parameterBag;
-protected $services;
-protected $methodMap;
-protected $aliases;
-protected $scopes;
-protected $scopeChildren;
-protected $scopedServices;
-protected $scopeStacks;
+protected $services = array();
+protected $methodMap = array();
+protected $aliases = array();
+protected $scopes = array();
+protected $scopeChildren = array();
+protected $scopedServices = array();
+protected $scopeStacks = array();
protected $loading = array();
public function __construct(ParameterBagInterface $parameterBag = null)
{
-$this->parameterBag = null === $parameterBag ? new ParameterBag() : $parameterBag;
-$this->services = array();
-$this->aliases = array();
-$this->scopes = array();
-$this->scopeChildren = array();
-$this->scopedServices = array();
-$this->scopeStacks = array();
+$this->parameterBag = $parameterBag ?: new ParameterBag();
$this->set('service_container', $this);
}
public function compile()
@@ -1892,7 +1974,7 @@ throw new RuntimeException(sprintf('You cannot set service "%s" of inactive scop
$this->scopedServices[$scope][$id] = $service;
}
$this->services[$id] = $service;
-if (method_exists($this, $method ='synchronize'.strtr($id, array('_'=>'','.'=>'_')).'Service')) {
+if (method_exists($this, $method ='synchronize'.strtr($id, array('_'=>'','.'=>'_','\\'=>'_')).'Service')) {
$this->$method();
}
if (self::SCOPE_CONTAINER !== $scope && null === $service) {
@@ -1905,26 +1987,31 @@ unset($this->services[$id]);
public function has($id)
{
$id = strtolower($id);
-return array_key_exists($id, $this->services)
-|| array_key_exists($id, $this->aliases)
-|| method_exists($this,'get'.strtr($id, array('_'=>'','.'=>'_')).'Service')
+return isset($this->services[$id])
+|| array_key_exists($id, $this->services)
+|| isset($this->aliases[$id])
+|| method_exists($this,'get'.strtr($id, array('_'=>'','.'=>'_','\\'=>'_')).'Service')
;
}
public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE)
{
+foreach (array(false, true) as $strtolower) {
+if ($strtolower) {
$id = strtolower($id);
+}
if (isset($this->aliases[$id])) {
$id = $this->aliases[$id];
}
-if (array_key_exists($id, $this->services)) {
+if (isset($this->services[$id]) || array_key_exists($id, $this->services)) {
return $this->services[$id];
}
+}
if (isset($this->loading[$id])) {
throw new ServiceCircularReferenceException($id, array_keys($this->loading));
}
if (isset($this->methodMap[$id])) {
$method = $this->methodMap[$id];
-} elseif (method_exists($this, $method ='get'.strtr($id, array('_'=>'','.'=>'_')).'Service')) {
+} elseif (method_exists($this, $method ='get'.strtr($id, array('_'=>'','.'=>'_','\\'=>'_')).'Service')) {
} else {
if (self::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior) {
if (!$id) {
@@ -1959,7 +2046,8 @@ return $service;
}
public function initialized($id)
{
-return array_key_exists(strtolower($id), $this->services);
+$id = strtolower($id);
+return isset($this->services[$id]) || array_key_exists($id, $this->services);
}
public function getServiceIds()
{
@@ -2053,7 +2141,7 @@ return isset($this->scopedServices[$name]);
}
public static function camelize($id)
{
-return strtr(ucwords(strtr($id, array('_'=>' ','.'=>'_ '))), array(' '=>''));
+return strtr(ucwords(strtr($id, array('_'=>' ','.'=>'_ ','\\'=>'_ '))), array(' '=>''));
}
public static function underscore($id)
{
@@ -2075,7 +2163,6 @@ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch =
namespace Symfony\Component\HttpKernel
{
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
use Symfony\Component\Config\Loader\LoaderInterface;
interface KernelInterface extends HttpKernelInterface, \Serializable
@@ -2123,7 +2210,6 @@ use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\Bundle\BundleInterface;
use Symfony\Component\HttpKernel\Config\FileLocator;
use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
@@ -2134,31 +2220,28 @@ use Symfony\Component\Config\ConfigCache;
use Symfony\Component\ClassLoader\ClassCollectionLoader;
abstract class Kernel implements KernelInterface, TerminableInterface
{
-protected $bundles;
+protected $bundles = array();
protected $bundleMap;
protected $container;
protected $rootDir;
protected $environment;
protected $debug;
-protected $booted;
+protected $booted = false;
protected $name;
protected $startTime;
protected $loadClassCache;
-protected $errorReportingLevel;
-const VERSION ='2.3.4';
-const VERSION_ID ='20304';
+const VERSION ='2.4.1';
+const VERSION_ID ='20401';
const MAJOR_VERSION ='2';
-const MINOR_VERSION ='3';
-const RELEASE_VERSION ='4';
+const MINOR_VERSION ='4';
+const RELEASE_VERSION ='1';
const EXTRA_VERSION ='';
public function __construct($environment, $debug)
{
$this->environment = $environment;
$this->debug = (Boolean) $debug;
-$this->booted = false;
$this->rootDir = $this->getRootDir();
$this->name = $this->getName();
-$this->bundles = array();
if ($this->debug) {
$this->startTime = microtime(true);
}
@@ -2371,7 +2454,8 @@ $directChildren[$parentName] = $name;
$topMostBundles[$name] = $bundle;
}
}
-if (count($diff = array_values(array_diff(array_keys($directChildren), array_keys($this->bundles))))) {
+if (!empty($directChildren) && count($diff = array_diff_key($directChildren, $this->bundles))) {
+$diff = array_keys($diff);
throw new \LogicException(sprintf('Bundle "%s" extends bundle "%s", which is not registered.', $directChildren[$diff[0]], $diff[0]));
}
$this->bundleMap = array();
@@ -2490,7 +2574,7 @@ $dumper->setProxyDumper(new ProxyDumper());
}
$content = $dumper->dump(array('class'=> $class,'base_class'=> $baseClass));
if (!$this->debug) {
-$content = self::stripComments($content);
+$content = static::stripComments($content);
}
$cache->write($content, $container->getResources());
}
@@ -2626,8 +2710,8 @@ use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
abstract class Bundle extends ContainerAware implements BundleInterface
{
protected $name;
-protected $reflected;
protected $extension;
+protected $path;
public function boot()
{
}
@@ -2661,17 +2745,16 @@ return $this->extension;
}
public function getNamespace()
{
-if (null === $this->reflected) {
-$this->reflected = new \ReflectionObject($this);
-}
-return $this->reflected->getNamespaceName();
+$class = get_class($this);
+return substr($class, 0, strrpos($class,'\\'));
}
public function getPath()
{
-if (null === $this->reflected) {
-$this->reflected = new \ReflectionObject($this);
+if (null === $this->path) {
+$reflected = new \ReflectionObject($this);
+$this->path = dirname($reflected->getFileName());
}
-return dirname($this->reflected->getFileName());
+return $this->path;
}
public function getParent()
{
@@ -2699,7 +2782,14 @@ $ns = $prefix;
if ($relativePath = $file->getRelativePath()) {
$ns .='\\'.strtr($relativePath,'/','\\');
}
-$r = new \ReflectionClass($ns.'\\'.$file->getBasename('.php'));
+$class = $ns.'\\'.$file->getBasename('.php');
+if ($this->container) {
+$alias ='console.command.'.strtolower(str_replace('\\','_', $class));
+if ($this->container->has($alias)) {
+continue;
+}
+}
+$r = new \ReflectionClass($class);
if ($r->isSubclassOf('Symfony\\Component\\Console\\Command\\Command') && !$r->isAbstract() && !$r->getConstructor()->getNumberOfRequiredParameters()) {
$application->add($r->newInstance());
}
@@ -2767,21 +2857,25 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
use Symfony\Component\HttpKernel\Event\PostResponseEvent;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
class HttpKernel implements HttpKernelInterface, TerminableInterface
{
protected $dispatcher;
protected $resolver;
-public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver)
+protected $requestStack;
+public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null)
{
$this->dispatcher = $dispatcher;
$this->resolver = $resolver;
+$this->requestStack = $requestStack ?: new RequestStack();
}
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
{
@@ -2789,6 +2883,7 @@ try {
return $this->handleRaw($request, $type);
} catch (\Exception $e) {
if (false === $catch) {
+$this->finishRequest($request, $type);
throw $e;
}
return $this->handleException($e, $request, $type);
@@ -2800,6 +2895,7 @@ $this->dispatcher->dispatch(KernelEvents::TERMINATE, new PostResponseEvent($this
}
private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
{
+$this->requestStack->push($request);
$event = new GetResponseEvent($this, $request, $type);
$this->dispatcher->dispatch(KernelEvents::REQUEST, $event);
if ($event->hasResponse()) {
@@ -2833,14 +2929,21 @@ private function filterResponse(Response $response, Request $request, $type)
{
$event = new FilterResponseEvent($this, $request, $type, $response);
$this->dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+$this->finishRequest($request, $type);
return $event->getResponse();
}
+private function finishRequest(Request $request, $type)
+{
+$this->dispatcher->dispatch(KernelEvents::FINISH_REQUEST, new FinishRequestEvent($this, $request, $type));
+$this->requestStack->pop();
+}
private function handleException(\Exception $e, $request, $type)
{
$event = new GetResponseForExceptionEvent($this, $request, $type, $e);
$this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
$e = $event->getException();
if (!$event->hasResponse()) {
+$this->finishRequest($request, $type);
throw $e;
}
$response = $event->getResponse();
@@ -2892,6 +2995,7 @@ return (string) $var;
namespace Symfony\Component\HttpKernel\DependencyInjection
{
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\HttpKernel;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
@@ -2901,9 +3005,9 @@ use Symfony\Component\DependencyInjection\Scope;
class ContainerAwareHttpKernel extends HttpKernel
{
protected $container;
-public function __construct(EventDispatcherInterface $dispatcher, ContainerInterface $container, ControllerResolverInterface $controllerResolver)
+public function __construct(EventDispatcherInterface $dispatcher, ContainerInterface $container, ControllerResolverInterface $controllerResolver, RequestStack $requestStack = null)
{
-parent::__construct($dispatcher, $controllerResolver);
+parent::__construct($dispatcher, $controllerResolver, $requestStack);
$this->container = $container;
if (!$container->hasScope('request')) {
$container->addScope(new Scope('request'));
View
28 framework-standard-edition/composer.json
@@ -7,16 +7,16 @@
"require" :
{
"php" : ">=5.3.3",
- "symfony/symfony" : "2.3.*",
- "doctrine/orm" : ">=2.2.3,<2.4-dev",
- "doctrine/doctrine-bundle" : "1.2.*",
- "twig/extensions" : "1.0.*",
- "symfony/assetic-bundle" : "2.3.*",
- "symfony/swiftmailer-bundle" : "2.3.*",
- "symfony/monolog-bundle" : "2.3.*",
- "sensio/distribution-bundle" : "2.3.*",
- "sensio/framework-extra-bundle" : "2.3.*",
- "sensio/generator-bundle" : "2.3.*",
+ "symfony/symfony" : "~2.4",
+ "doctrine/orm" : "~2.2,>=2.2.3",
+ "doctrine/doctrine-bundle" : "~1.2",
+ "twig/extensions" : "~1.0",
+ "symfony/assetic-bundle" : "~2.3",
+ "symfony/swiftmailer-bundle" : "~2.3",
+ "symfony/monolog-bundle" : "~2.4",
+ "sensio/distribution-bundle" : "~2.3",
+ "sensio/framework-extra-bundle" : "~3.0",
+ "sensio/generator-bundle" : "~2.3",
"incenteev/composer-parameter-handler" : "~2.0",
"braincrafted/bootstrap-bundle" : "1.4.2",
"twitter/bootstrap" : "v2.3.2",
@@ -29,14 +29,16 @@
},
"scripts":
{
- "post-install-cmd": [
+ "post-install-cmd":
+ [
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
],
- "post-update-cmd": [
+ "post-update-cmd":
+ [
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
@@ -51,7 +53,7 @@
"symfony-app-dir": "app",
"symfony-web-dir": "web",
"incenteev-parameters": { "file": "app/config/parameters.yml" },
- "branch-alias": { "dev-master": "2.3-dev" }
+ "branch-alias": { "dev-master": "2.4-dev" }
},
"repositories":
[
View
864 framework-standard-edition/composer.lock
@@ -3,46 +3,96 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "885b50419564a5702ee23503e2e307b8",
+ "hash": "4293a0e891f0e51079c20394f44c7784",
"packages": [
{
- "name": "alchemy/zippy",
- "version": "0.1.0",
+ "name": "braincrafted/bootstrap-bundle",
+ "version": "1.4.2",
+ "target-dir": "Bc/Bundle/BootstrapBundle",
"source": {
"type": "git",
- "url": "https://github.com/alchemy-fr/Zippy.git",
- "reference": "cf347b6dfee84a135bb5791004d1ce1ac04f095e"
+ "url": "https://github.com/braincrafted/bootstrap-bundle.git",
+ "reference": "v1.4.2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/alchemy-fr/Zippy/zipball/cf347b6dfee84a135bb5791004d1ce1ac04f095e",
- "reference": "cf347b6dfee84a135bb5791004d1ce1ac04f095e",
+ "url": "https://api.github.com/repos/braincrafted/bootstrap-bundle/zipball/v1.4.2",
+ "reference": "v1.4.2",
"shasum": ""
},
"require": {
- "doctrine/collections": "~1.0",
- "guzzle/guzzle": "~3.0",
- "php": ">=5.3.3",
- "pimple/pimple": "~1.0",
- "symfony/filesystem": "~2.0",
- "symfony/process": "~2.0"
+ "php": ">=5.3.3"
},
"require-dev": {
- "ext-zip": "*",
- "symfony/finder": "~2.0"
+ "instaclick/php-code-sniffer": "dev-master",
+ "instaclick/symfony2-coding-standard": "dev-master",
+ "knplabs/knp-markdown-bundle": "dev-master",
+ "knplabs/knp-menu": "dev-master",
+ "knplabs/knp-menu-bundle": "dev-master",
+ "knplabs/knp-paginator-bundle": "dev-master",
+ "nikic/php-parser": "dev-master",
+ "phpmd/phpmd": "1.4.*"
},
"suggest": {
- "ext-zip": "To use the ZipExtensionAdapter"
+ "knplabs/knp-menu": "Required to use KnpMenuBundle.",
+ "knplabs/knp-menu-bundle": "BraincraftedBootstrapBundle styles the menus provided by KnpMenuBundle.",
+ "knplabs/knp-paginator-bundle": "BraincraftedBootstrapBundle styles the pagination provided by KnpPaginatorBundle.",
+ "twitter/bootstrap": "Twitter Bootstrap provides the assets (images, CSS and JS)"
+ },
+ "type": "symfony-bundle",
+ "autoload": {
+ "psr-0": {
+ "Bc\\Bundle\\BootstrapBundle": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Florian Eckerstorfer",
+ "email": "florian@eckerstorfer.co",
+ "homepage": "http://florianeckerstorfer.com",
+ "role": "Developer"
+ }
+ ],
+ "description": "Twitter Bootstrap for Symfony2",
+ "keywords": [
+ "bootstrap"
+ ],
+ "time": "2013-04-12 23:57:05"
+ },
+ {
+ "name": "doctrine/annotations",
+ "version": "v1.1.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/annotations.git",
+ "reference": "40db0c96985aab2822edbc4848b3bd2429e02670"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670",
+ "reference": "40db0c96985aab2822edbc4848b3bd2429e02670",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/lexer": "1.*",
+ "php": ">=5.3.2"
+ },
+ "require-dev": {
+ "doctrine/cache": "1.*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.1.x-dev"
+ "dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-0": {
- "Alchemy": "src"
+ "Doctrine\\Common\\Annotations\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -51,58 +101,73 @@
],
"authors": [
{
- "name": "Phraseanet Team",
- "email": "info@alchemy.fr",
- "homepage": "http://www.phraseanet.com/"
+ "name": "Jonathan H. Wage",
+ "email": "jonwage@gmail.com",
+ "homepage": "http://www.jwage.com/",
+ "role": "Creator"
+ },
+ {
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com",
+ "homepage": "http://www.instaclick.com"
+ },
+ {
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com",
+ "homepage": "http://jmsyst.com",
+ "role": "Developer of wrapped JMSSerializerBundle"
}
],
- "description": "Zippy, the archive manager companion",
+ "description": "Docblock Annotations Parser",
+ "homepage": "http://www.doctrine-project.org",
"keywords": [
- "bzip",
- "compression",
- "tar",
- "zip"
+ "annotations",
+ "docblock",
+ "parser"
],
- "time": "2013-03-11 20:39:21"
+ "time": "2013-06-16 21:33:03"
},
{
- "name": "braincrafted/bootstrap-bundle",
- "version": "1.4.2",
- "target-dir": "Bc/Bundle/BootstrapBundle",
+ "name": "doctrine/cache",
+ "version": "v1.3.0",