Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: symfony/symfony-standard
...
head fork: symfony/symfony-standard
  • 12 commits
  • 7 files changed
  • 6 commit comments
  • 5 contributors
Commits on Jul 25, 2011
@stealth35 stealth35 removed alias (die to exit) 5cc3832
Commits on Jul 28, 2011
@winzou winzou Fix condition for APC checking, as it currently shows this majorProbl…
…em even if APC is not installed at all
96e96eb
@winzou winzou Fix APC version check, and move it to mandatory requirements 8b1a403
Commits on Jul 30, 2011
@brikou brikou framework.translator.fallback set to %locale% 1b86986
@brikou brikou commented translator entry 3cd30b6
Commits on Aug 02, 2011
@fabpot fabpot merged branch winzou/patch-1 (PR #163)
Commits
-------

8b1a403 Fix APC version check, and move it to mandatory requirements
96e96eb Fix condition for APC checking, as it currently shows this majorProblem even if APC is not installed at all

Discussion
----------

Fix condition for APC checking, as it currently shows this majorProblem e

Fix condition for APC checking, as it currently shows this majorProblem even if APC is not installed at all.

Quite disturbing for all users that don't have APC and don't know what it is.

---------------------------------------------------------------------------

by insow at 2011/07/28 09:02:28 -0700

Thank you ! 1 hour searching to solve the problem with my configurations and it was only a condition problem >_<...

---------------------------------------------------------------------------

by stealth35 at 2011/07/28 09:15:09 -0700

@nsow sorry for that, my bad

---------------------------------------------------------------------------

by winzou at 2011/07/29 07:35:54 -0700

@fabpot, this PR should be merge as it scares a lot of new users at the very beginning of their use (many feedbacks from my tutorial @ http://www.siteduzero.com/tutoriel-3-517569-symfony2.html )
ad4a4a4
Commits on Aug 05, 2011
Mateusz Heleniak replaced app/bootstrap wildcard with explicit entry
this could be done as `app/bootstrap_cache.php.cache` is no longer created and used (see 8a7be4f)
e7b7b0f
Commits on Aug 19, 2011
@fabpot fabpot merged branch mheleniak/patch-1 (PR #172)
Commits
-------

e7b7b0f replaced app/bootstrap wildcard with explicit entry

Discussion
----------

replaced app/bootstrap wildcard with explicit entry in .gitignore

The wildcard could be changed to more explicit entry because `app/bootstrap_cache.php.cache` is no longer created and used (see 8a7be4f).
0597635
@fabpot fabpot merged branch brikou/locale (PR #165)
Commits
-------

3cd30b6 commented translator entry
1b86986 framework.translator.fallback set to %locale%

Discussion
----------

framework.translator.fallback set to %locale%

---------------------------------------------------------------------------

by stloyd at 2011/07/30 03:38:42 -0700

AFAIK translator is not enabled by default so you should not uncomment it in default config.

---------------------------------------------------------------------------

by brikou at 2011/07/30 03:54:59 -0700

@stloyd done thx
7446265
@fabpot fabpot merged branch stealth35/master (PR #158)
Commits
-------

5cc3832 removed alias (die to exit)

Discussion
----------

removed alias (die to exit)

---------------------------------------------------------------------------

by brikou at 2011/07/25 09:09:29 -0700

what is the purpose of this PR?

---------------------------------------------------------------------------

by stealth35 at 2011/07/25 09:11:29 -0700

because you shouldn't use an [alias](http://www.php.net/manual/en/aliases.php), and there is no other die except here

---------------------------------------------------------------------------

by brikou at 2011/07/25 09:24:58 -0700

ok
b6d9e25
Commits on Aug 23, 2011
@fabpot fabpot updated vendors 0248da1
Commits on Aug 26, 2011
@fabpot fabpot updated VENDORS for 2.0.1 45c4b38
View
2  .gitignore
@@ -1,5 +1,5 @@
web/bundles/
-app/bootstrap*
+app/bootstrap.php.cache
app/cache/*
app/logs/*
build/
View
4 app/check.php
@@ -31,6 +31,7 @@
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);
+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);
// warnings
echo_title("Optional checks");
@@ -71,7 +72,6 @@ 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);
@@ -97,7 +97,7 @@ function check($boolean, $message, $help = '', $fatal = false)
if (!$boolean) {
echo " *** $help ***\n";
if ($fatal) {
- die("You must fix this problem before resuming the check.\n");
+ exit("You must fix this problem before resuming the check.\n");
}
}
}
View
2  app/config/config.yml
@@ -4,7 +4,7 @@ imports:
framework:
#esi: ~
- #translator: { fallback: en }
+ #translator: { fallback: %locale% }
secret: %secret%
charset: UTF-8
router: { resource: "%kernel.root_dir%/config/routing.yml" }
View
16 deps
@@ -1,30 +1,30 @@
[symfony]
git=http://github.com/symfony/symfony.git
- version=v2.0.0
+ version=v2.0.1
[twig]
git=http://github.com/fabpot/Twig.git
- version=v1.1.1
+ version=v1.1.2
[monolog]
git=http://github.com/Seldaek/monolog.git
- version=1.0.0
+ version=1.0.1
[doctrine-common]
git=http://github.com/doctrine/common.git
- version=2.1.0
+ version=2.1.1
[doctrine-dbal]
git=http://github.com/doctrine/dbal.git
- version=2.1.0
+ version=2.1.1
[doctrine]
git=http://github.com/doctrine/doctrine2.git
- version=2.1.0
+ version=2.1.1
[swiftmailer]
git=http://github.com/swiftmailer/swiftmailer.git
- version=v4.1.0
+ version=v4.1.1
[assetic]
git=http://github.com/kriswallsmith/assetic.git
@@ -56,4 +56,4 @@
[AsseticBundle]
git=http://github.com/symfony/AsseticBundle.git
target=/bundles/Symfony/Bundle/AsseticBundle
- version=v1.0.0RC2
+ version=v1.0.0
View
22 deps.lock
@@ -1,15 +1,15 @@
-symfony c3ebdbf9cceddb82cd2089aaef8c7b992e536363
-twig 94ac20f1553d945c2c224d19d9d28e85ec14372b
-monolog 433b98d4218c181bae01865901aac045585e8a1a
-doctrine-common 40f1bf16e84ddc5291a6a63aa00b9879c40e3500
-doctrine-dbal 0127ee98a4301f2f6e3463c824adc3a3687f901f
-doctrine dfdb7353065407afc997956e23f3a44ec3effd72
-swiftmailer c53c8c1ab88c78c463ba65086d93d00193957e94
+symfony 7cb402d806a9615cf8bcafcfd049da00914b45f8
+twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5
+monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2
+doctrine-common 174111c8d245d560e1af4c7455b730347f85686d
+doctrine-dbal 54f474b3c321676ceadbe4288396902405d87756
+doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5
+swiftmailer 1f273a7cd466a2dd82e59431dd5ce15f36996688
assetic 3333d371c4511abcdec7bad86e15ac2be3b10f03
-twig-extensions 6b0cc16934b6e62ef07c8d2e59f9f13ff3193d3d
+twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54
metadata 8717ad2a5689480765d9ffafe925cd8a2457e582
-SensioFrameworkExtraBundle bced40d4d123f5171f888d6e56bb638b8c2a5e57
-JMSSecurityExtraBundle 936892c9735f76037393639f1410773715bf403c
+SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17
+JMSSecurityExtraBundle facedd50988b311f778288ea3b5e070591936f30
SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870
-SensioGeneratorBundle 84c41ef39046ba652c0201c29816a0ff7b23e1f5
+SensioGeneratorBundle 52038c005d565a1bd4986dcdef207ed9f1246b32
AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10
View
2  web/app_dev.php
@@ -7,7 +7,7 @@
'::1',
))) {
header('HTTP/1.0 403 Forbidden');
- die('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
+ exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
}
require_once __DIR__.'/../app/bootstrap.php.cache';
View
6 web/config.php
@@ -1,7 +1,7 @@
<?php
if (!isset($_SERVER['HTTP_HOST'])) {
- die('This script cannot be run from the CLI. Run it from a browser.');
+ exit('This script cannot be run from the CLI. Run it from a browser.');
}
if (!in_array(@$_SERVER['REMOTE_ADDR'], array(
@@ -9,7 +9,7 @@
'::1',
))) {
header('HTTP/1.0 403 Forbidden');
- die('This script is only accessible from localhost.');
+ exit('This script is only accessible from localhost.');
}
$majorProblems = array();
@@ -49,7 +49,7 @@
$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', '>='))) {
+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+)';
}

Showing you all comments on commits in this comparison.

@stof
Collaborator

you should probably also change the version for Monolog as it contains several improvements upon 1.0.0 (for the FirePHP handler for instance)

@fabpot
Owner

I don't see any 1.0 branch or 1.0.1 version. I don't want to use master here as we need to keep BC.

@stof
Collaborator

currently, the master branch is fully BC

@fabpot
Owner

ok, but that does not mean that it will stay the same. I'd prefer to have a proper tag or a branch that certifies that BC will be kept.

@stloyd

AFAIK there is tag for version 1.0.0.

@stof
Collaborator

@stloyd the point of my comment was to get the improvement made after the 1.0.0 release (which is used currently)

Something went wrong with that request. Please try again.