This repository has been archived by the owner on Oct 20, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4274f4d
commit 6426b9e
Showing
89 changed files
with
4,780 additions
and
3,469 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,13 @@ | ||
.idea | ||
.sass-cache | ||
htdocs/data | ||
htdocs/assets/.listen_test | ||
vendor | ||
composer.phar | ||
/.idea | ||
/.sass-cache | ||
/web/data | ||
/vendor | ||
/composer.phar | ||
/web/bundles/ | ||
/app/bootstrap.php.cache | ||
/app/cache/* | ||
/app/logs/* | ||
/build/ | ||
/vendor/ | ||
/bin/ | ||
/app/config/parameters.yml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,19 @@ | ||
Copyright (c) 2012 Gründerhub FrankfurtRheinMain | ||
Copyright (c) 2004-2013 Fabien Potencier | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is furnished | ||
to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | ||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
THE SOFTWARE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
UPGRADE FROM 2.1 to 2.2 | ||
======================= | ||
|
||
* The [`web/.htaccess`](https://github.com/symfony/symfony-standard/blob/2.2/web/.htaccess) | ||
file has been enhanced substantially to prevent duplicate content with and | ||
without `/app.php` in the URI. It also improves functionality when using | ||
Apache aliases or when mod_rewrite is not available. So you might want to | ||
update your `.htaccess` file as well. | ||
|
||
* The ``_internal`` route is not used any more. It should then be removed | ||
from both your routing and security configurations. A ``fragments`` key has | ||
been added to the framework configuration and must be specified when ESI or | ||
Hinclude are in use. No security configuration is required for this path as | ||
by default ESI access is only permitted for trusted hosts and Hinclude | ||
access uses an URL signing mechanism. | ||
|
||
``` | ||
framework: | ||
# ... | ||
fragments: { path: /_proxy } | ||
``` | ||
|
||
Functional Tests | ||
---------------- | ||
|
||
* The profiler has been disabled by default in the test environment. You can | ||
enable it again by modifying the ``config_test.yml`` configuration file or | ||
even better, you can just enable it for the very next request by calling | ||
``$client->enableProfiler()`` when you need the profiler in a test (that | ||
speeds up functional tests quite a bit). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,268 @@ | ||
Symfony Standard Edition Upgrade | ||
================================ | ||
|
||
From Symfony 2.0 to Symfony 2.1 | ||
------------------------------- | ||
|
||
### Project Dependencies | ||
|
||
As of Symfony 2.1, project dependencies are managed by | ||
[Composer](http://getcomposer.org/): | ||
|
||
* The `bin/vendors` script can be removed as `composer.phar` does all the work | ||
now (it is recommended to install it globally on your machine). | ||
|
||
* The `deps` file need to be replaced with the `composer.json` one. | ||
|
||
* The `composer.lock` is the equivalent of the generated `deps.lock` file and | ||
it is automatically generated by Composer. | ||
|
||
Download the default | ||
[`composer.json`](https://raw.github.com/symfony/symfony-standard/2.1/composer.json) | ||
and | ||
[`composer.lock`](https://raw.github.com/symfony/symfony-standard/2.1/composer.lock) | ||
files for Symfony 2.1 and put them into the main directory of your project. If | ||
you have customized your `deps` file, move the added dependencies to the | ||
`composer.json` file (many bundles and PHP libraries are already available as | ||
Composer packages -- search for them on [Packagist](http://packagist.org/)). | ||
|
||
Remove your current `vendor` directory. | ||
|
||
Finally, run Composer: | ||
|
||
$ composer.phar install | ||
|
||
Note: You must complete the upgrade steps below so composer can successfully generate the autoload files. | ||
|
||
### `app/autoload.php` | ||
|
||
The default `autoload.php` reads as follows (it has been simplified a lot as | ||
autoloading for libraries and bundles declared in your `composer.json` file is | ||
automatically managed by the Composer autoloader): | ||
|
||
<?php | ||
|
||
use Doctrine\Common\Annotations\AnnotationRegistry; | ||
|
||
$loader = include __DIR__.'/../vendor/autoload.php'; | ||
|
||
// intl | ||
if (!function_exists('intl_get_error_code')) { | ||
require_once __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php'; | ||
|
||
$loader->add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs'); | ||
} | ||
|
||
AnnotationRegistry::registerLoader(array($loader, 'loadClass')); | ||
|
||
return $loader; | ||
|
||
### `app/config/config.yml` | ||
|
||
The `framework.charset` setting must be removed. If you are not using `UTF-8` | ||
for your application, override the `getCharset()` method in your `AppKernel` | ||
class instead: | ||
|
||
class AppKernel extends Kernel | ||
{ | ||
public function getCharset() | ||
{ | ||
return 'ISO-8859-1'; | ||
} | ||
|
||
// ... | ||
} | ||
|
||
You might want to add the new `strict_requirements` parameter to | ||
`framework.router` (it avoids fatal errors in the production environment when | ||
a link cannot be generated): | ||
|
||
framework: | ||
router: | ||
strict_requirements: %kernel.debug% | ||
|
||
You can even disable the requirements check on production with `null` as you should | ||
know that the parameters for URL generation always pass the requirements, e.g. by | ||
validating them beforehand. This additionally enhances performance. See | ||
[config_prod.yml](https://github.com/symfony/symfony-standard/blob/master/app/config/config_prod.yml). | ||
|
||
The `default_locale` parameter is now a setting of the main `framework` | ||
configuration (it was under the `framework.session` in 2.0): | ||
|
||
framework: | ||
default_locale: %locale% | ||
|
||
The `auto_start` setting under `framework.session` must be removed as it is | ||
not used anymore (the session is now always started on-demand). If | ||
`auto_start` was the only setting under the `framework.session` entry, don't | ||
remove it entirely, but set its value to `~` (`~` means `null` in YAML) | ||
instead: | ||
|
||
framework: | ||
session: ~ | ||
|
||
The `trust_proxy_headers` setting was added in the default configuration file | ||
(as it should be set to `true` when you install your application behind a | ||
reverse proxy): | ||
|
||
framework: | ||
trust_proxy_headers: false | ||
|
||
An empty `bundles` entry was added to the `assetic` configuration: | ||
|
||
assetic: | ||
bundles: [] | ||
|
||
The default `swiftmailer` configuration now has the `spool` setting configured | ||
to the `memory` type to defer email sending after the response is sent to the | ||
user (recommended for better end-user performance): | ||
|
||
swiftmailer: | ||
spool: { type: memory } | ||
|
||
The `jms_security_extra` configuration was moved to the `security.yml` | ||
configuration file. | ||
|
||
### `app/config/config_dev.yml` | ||
|
||
An example of how to send all emails to a unique address was added: | ||
|
||
#swiftmailer: | ||
# delivery_address: me@example.com | ||
|
||
### `app/config/config_test.yml` | ||
|
||
The `storage_id` setting must be changed to `session.storage.mock_file`: | ||
|
||
framework: | ||
session: | ||
storage_id: session.storage.mock_file | ||
|
||
### `app/config/parameters.ini` | ||
|
||
The file has been converted to a YAML file which reads as follows: | ||
|
||
parameters: | ||
database_driver: pdo_mysql | ||
database_host: localhost | ||
database_port: ~ | ||
database_name: symfony | ||
database_user: root | ||
database_password: ~ | ||
|
||
mailer_transport: smtp | ||
mailer_host: localhost | ||
mailer_user: ~ | ||
mailer_password: ~ | ||
|
||
locale: en | ||
secret: ThisTokenIsNotSoSecretChangeIt | ||
|
||
Note that if you convert your parameters file to YAML, you must also change | ||
its reference in `app/config/config.yml`. | ||
|
||
### `app/config/routing_dev.yml` | ||
|
||
The `_assetic` entry was removed: | ||
|
||
#_assetic: | ||
# resource: . | ||
# type: assetic | ||
|
||
### `app/config/security.yml` | ||
|
||
Under `security.access_control`, the default rule for internal routes was changed: | ||
|
||
security: | ||
access_control: | ||
#- { path: ^/_internal/secure, roles: IS_AUTHENTICATED_ANONYMOUSLY, ip: 127.0.0.1 } | ||
|
||
Under `security.providers`, the `in_memory` example was updated to the following: | ||
|
||
security: | ||
providers: | ||
in_memory: | ||
memory: | ||
users: | ||
user: { password: userpass, roles: [ 'ROLE_USER' ] } | ||
admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] } | ||
|
||
### `app/AppKernel.php` | ||
|
||
The following bundles have been added to the list of default registered bundles: | ||
|
||
new JMS\AopBundle\JMSAopBundle(), | ||
new JMS\DiExtraBundle\JMSDiExtraBundle($this), | ||
|
||
You must also rename the DoctrineBundle from: | ||
|
||
new Symfony\Bundle\DoctrineBundle\DoctrineBundle(), | ||
|
||
to: | ||
|
||
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), | ||
|
||
### `web/app.php` | ||
|
||
The default `web/app.php` file now reads as follows: | ||
|
||
<?php | ||
|
||
use Symfony\Component\ClassLoader\ApcClassLoader; | ||
use Symfony\Component\HttpFoundation\Request; | ||
|
||
$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; | ||
|
||
// Use APC for autoloading to improve performance. | ||
// Change 'sf2' to a unique prefix in order to prevent cache key conflicts | ||
// with other applications also using APC. | ||
/* | ||
$loader = new ApcClassLoader('sf2', $loader); | ||
$loader->register(true); | ||
*/ | ||
|
||
require_once __DIR__.'/../app/AppKernel.php'; | ||
//require_once __DIR__.'/../app/AppCache.php'; | ||
|
||
$kernel = new AppKernel('prod', false); | ||
$kernel->loadClassCache(); | ||
//$kernel = new AppCache($kernel); | ||
$request = Request::createFromGlobals(); | ||
$response = $kernel->handle($request); | ||
$response->send(); | ||
$kernel->terminate($request, $response); | ||
|
||
### `web/app_dev.php` | ||
|
||
The default `web/app_dev.php` file now reads as follows: | ||
|
||
<?php | ||
|
||
use Symfony\Component\HttpFoundation\Request; | ||
|
||
// If you don't want to setup permissions the proper way, just uncomment the following PHP line | ||
// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information | ||
//umask(0000); | ||
|
||
// This check prevents access to debug front controllers that are deployed by accident to production servers. | ||
// Feel free to remove this, extend it, or make something more sophisticated. | ||
if (isset($_SERVER['HTTP_CLIENT_IP']) | ||
|| isset($_SERVER['HTTP_X_FORWARDED_FOR']) | ||
|| !in_array(@$_SERVER['REMOTE_ADDR'], array( | ||
'127.0.0.1', | ||
'::1', | ||
)) | ||
) { | ||
header('HTTP/1.0 403 Forbidden'); | ||
exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.'); | ||
} | ||
|
||
$loader = require_once __DIR__.'/../app/bootstrap.php.cache'; | ||
require_once __DIR__.'/../app/AppKernel.php'; | ||
|
||
$kernel = new AppKernel('dev', true); | ||
$kernel->loadClassCache(); | ||
$request = Request::createFromGlobals(); | ||
$response = $kernel->handle($request); | ||
$response->send(); | ||
$kernel->terminate($request, $response); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<?php | ||
|
||
require_once __DIR__.'/AppKernel.php'; | ||
|
||
use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache; | ||
|
||
class AppCache extends HttpCache | ||
{ | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
<?php | ||
|
||
use Symfony\Component\HttpKernel\Kernel; | ||
use Symfony\Component\Config\Loader\LoaderInterface; | ||
|
||
class AppKernel extends Kernel | ||
{ | ||
public function registerBundles() | ||
{ | ||
$bundles = array( | ||
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), | ||
new Symfony\Bundle\SecurityBundle\SecurityBundle(), | ||
new Symfony\Bundle\TwigBundle\TwigBundle(), | ||
new Symfony\Bundle\MonologBundle\MonologBundle(), | ||
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), | ||
new Symfony\Bundle\AsseticBundle\AsseticBundle(), | ||
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), | ||
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), | ||
new JMS\AopBundle\JMSAopBundle(), | ||
new JMS\DiExtraBundle\JMSDiExtraBundle($this), | ||
new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(), | ||
new UGRM\WebBundle\UGRMWebBundle(), | ||
new UGRM\DataBundle\UGRMDataBundle(), | ||
); | ||
|
||
if (in_array($this->getEnvironment(), array('dev', 'test'))) { | ||
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); | ||
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); | ||
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); | ||
} | ||
|
||
return $bundles; | ||
} | ||
|
||
public function registerContainerConfiguration(LoaderInterface $loader) | ||
{ | ||
$loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml'); | ||
} | ||
} |
Oops, something went wrong.