Skip to content
Browse files

Ultimos cambios para Symfony v2.0.0 stable

  • Loading branch information...
1 parent bf0a42d commit 7bfa53a13a67da537b7cca74c7630b6ca46956d0 @ajessu ajessu committed
Showing with 44 additions and 18 deletions.
  1. +4 −5 .gitignore
  2. +2 −1 app/AppKernel.php
  3. +3 −0 app/check.php
  4. +9 −8 app/config/config.yml
  5. +5 −0 app/config/config_prod.yml
  6. +5 −0 app/config/routing.yml
  7. +1 −1 app/config/routing_dev.yml
  8. +3 −3 deps.lock
  9. +12 −0 web/config.php
View
9 .gitignore
@@ -1,7 +1,6 @@
+web/bundles/
+app/bootstrap*
app/cache/*
app/logs/*
-vendor/*
-web/bundles/*
-app/bootstrap.php.cache
-app/bootstrap_cache.php.cache
-
+build/
+vendor/
View
3 app/AppKernel.php
@@ -24,7 +24,8 @@ public function registerBundles()
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
- $bundles[] = new Symfony\Bundle\WebConfiguratorBundle\SymfonyWebConfiguratorBundle();
+ $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
+ $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
}
return $bundles;
View
3 app/check.php
@@ -29,6 +29,8 @@
check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true);
check(function_exists('json_encode'), 'Checking that the json_encode() is available', 'Install and enable the json extension', true);
check(class_exists('SQLite3') || in_array('sqlite', PDO::getAvailableDrivers()), 'Checking that the SQLite3 or PDO_SQLite extension is available', 'Install and enable the SQLite3 or PDO_SQLite extension.', true);
+check(function_exists('session_start'), 'Checking that the session_start() is available', 'Install and enable the session extension', true);
+check(function_exists('ctype_alpha'), 'Checking that the ctype_alpha() is available', 'Install and enable the ctype extension', true);
// warnings
echo_title("Optional checks");
@@ -69,6 +71,7 @@ function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
function_exists('xcache_set')
;
check($accelerator, 'Checking that a PHP accelerator is installed', 'Install a PHP accelerator like APC (highly recommended)', false);
+check(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your APC extension (3.0.17+)', true);
check(!ini_get('short_open_tag'), 'Checking that php.ini has short_open_tag set to off', 'Set short_open_tag to off in php.ini', false);
check(!ini_get('magic_quotes_gpc'), 'Checking that php.ini has magic_quotes_gpc set to off', 'Set magic_quotes_gpc to off in php.ini', false);
View
17 app/config/config.yml
@@ -3,14 +3,15 @@ imports:
- { resource: security.yml }
framework:
- charset: UTF-8
- secret: %secret%
- csrf_protection:
- enabled: true
- form: { enabled: true }
- router: { resource: "%kernel.root_dir%/config/routing.yml" }
- validation: { enabled: true, enable_annotations: true }
- templating: { engines: ['twig'] } #assets_version: SomeVersionScheme
+ #esi: ~
+ #translator: { fallback: en }
+ secret: %secret%
+ charset: UTF-8
+ router: { resource: "%kernel.root_dir%/config/routing.yml" }
+ form: true
+ csrf_protection: true
+ validation: { enable_annotations: true }
+ templating: { engines: ['twig'] } #assets_version: SomeVersionScheme
session:
default_locale: %locale%
auto_start: true
View
5 app/config/config_prod.yml
@@ -1,6 +1,11 @@
imports:
- { resource: config.yml }
+#doctrine:
+# metadata_cache_driver: apc
+# result_cache_driver: apc
+# query_cache_driver: apc
+
monolog:
handlers:
main:
View
5 app/config/routing.yml
@@ -1,3 +1,8 @@
+# Internal routing configuration to handle ESI
+#_internal:
+# resource: "@FrameworkBundle/Resources/config/routing/internal.xml"
+# prefix: /_internal
+
# Rutas del proyecto Desymfony
_ponencias:
resource: @DesymfonyBundle/Resources/config/ponencia_routing.yml
View
2 app/config/routing_dev.yml
@@ -11,7 +11,7 @@ _profiler:
prefix: /_profiler
_configurator:
- resource: "@SymfonyWebConfiguratorBundle/Resources/config/routing/configurator.xml"
+ resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
prefix: /_configurator
_main:
View
6 deps.lock
@@ -9,9 +9,9 @@ assetic 3333d371c4511abcdec7bad86e15ac2be3b10f03
twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d
metadata 8717ad2a5689480765d9ffafe925cd8a2457e582
SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57
-JMSSecurityExtraBundle 44719285571ba342dbaa2dd86a78423b7e1d7f01
+JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c
SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870
SensioGeneratorBundle 84c41ef39046ba652c0201c29816a0ff7b23e1f5
AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10
-doctrine-fixtures d6b447044b02102d127bbf7e825341577647d34b
-DoctrineFixturesBundle 5a055fbd53e3f32d33c3858f9b3243389ee8bdaf
+doctrine-fixtures 4a8464ef83093de2378cef2770e13da7e4858ffc
+DoctrineFixturesBundle d0d6a6e4fbbea44ab1ab7d4a107b7818d9562010
View
12 web/config.php
@@ -49,6 +49,10 @@
$minorProblems[] = 'Install and enable a <strong>PHP accelerator</strong> like APC (highly recommended).';
}
+if (!(function_exists('apc_store') && ini_get('apc.enabled') && version_compare(phpversion('apc'), '3.0.17', '>='))) {
+ $majorProblems[] = 'Upgrade your <strong>APC</strong> extension (3.0.17+)';
+}
+
if (!function_exists('token_get_all')) {
$minorProblems[] = 'Install and enable the <strong>Tokenizer</strong> extension.';
}
@@ -100,6 +104,14 @@
$majorProblems[] = 'Install and enable the <strong>json</strong> extension.';
}
+if (!function_exists('session_start')) {
+ $majorProblems[] = 'Install and enable the <strong>session</strong> extension.';
+}
+
+if (!function_exists('ctype_alpha')) {
+ $majorProblems[] = 'Install and enable the <strong>ctype</strong> extension.';
+}
+
// php.ini
if (!ini_get('date.timezone')) {
$phpini = true;

0 comments on commit 7bfa53a

Please sign in to comment.
Something went wrong with that request. Please try again.