From 87a15df786256a087bc590d4f4efd381afe6adbb Mon Sep 17 00:00:00 2001 From: Philipp Rieber Date: Tue, 5 Nov 2013 08:17:38 +0100 Subject: [PATCH 1/3] [Reference][Requirements] Fix missing literal formatting --- reference/requirements.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/requirements.rst b/reference/requirements.rst index fbcb316f790..447b4f1d6e4 100644 --- a/reference/requirements.rst +++ b/reference/requirements.rst @@ -22,7 +22,7 @@ Required * PHP needs to be a minimum version of PHP 5.3.3 * JSON needs to be enabled * ctype needs to be enabled -* Your PHP.ini needs to have the date.timezone setting +* Your PHP.ini needs to have the ``date.timezone`` setting Optional -------- From edf7961a459770bfd395ed7b107474f8340e8c57 Mon Sep 17 00:00:00 2001 From: Philipp Rieber Date: Tue, 5 Nov 2013 10:34:29 +0100 Subject: [PATCH 2/3] Normalize notation of php.ini --- components/http_foundation/session_configuration.rst | 6 +++--- components/http_foundation/sessions.rst | 2 +- cookbook/form/form_collections.rst | 2 +- reference/configuration/framework.rst | 2 +- reference/constraints/File.rst | 2 +- reference/requirements.rst | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/http_foundation/session_configuration.rst b/components/http_foundation/session_configuration.rst index 7af9a0e947a..d6084fbc3b9 100644 --- a/components/http_foundation/session_configuration.rst +++ b/components/http_foundation/session_configuration.rst @@ -26,7 +26,7 @@ So-called 'native' handlers, are save handlers which are either compiled into PHP or provided by PHP extensions, such as PHP-Sqlite, PHP-Memcached and so on. All native save handlers are internal to PHP and as such, have no public facing API. -They must be configured by PHP ini directives, usually ``session.save_path`` and +They must be configured by php.ini directives, usually ``session.save_path`` and potentially other driver specific directives. Specific details can be found in docblock of the ``setOptions()`` method of each class. @@ -87,7 +87,7 @@ Configuring PHP Sessions ~~~~~~~~~~~~~~~~~~~~~~~~ The :class:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage` -can configure most of the PHP ini configuration directives which are documented +can configure most of the php.ini configuration directives which are documented at `php.net/session.configuration`_. To configure these settings, pass the keys (omitting the initial ``session.`` part @@ -131,7 +131,7 @@ example if these were set to ``5/100`` respectively, it would mean a probability of 5%. Similarly, ``3/4`` would mean a 3 in 4 chance of being called, i.e. 75%. If the garbage collection handler is invoked, PHP will pass the value stored in -the PHP ini directive ``session.gc_maxlifetime``. The meaning in this context is +the php.ini directive ``session.gc_maxlifetime``. The meaning in this context is that any stored session that was saved more than ``maxlifetime`` ago should be deleted. This allows one to expire records based on idle time. diff --git a/components/http_foundation/sessions.rst b/components/http_foundation/sessions.rst index c8efc9f3af7..24d2b2b76c6 100644 --- a/components/http_foundation/sessions.rst +++ b/components/http_foundation/sessions.rst @@ -50,7 +50,7 @@ Quick example:: .. caution:: - Symfony sessions are incompatible with PHP ini directive ``session.auto_start = 1`` + Symfony sessions are incompatible with php.ini directive ``session.auto_start = 1`` This directive should be turned off in ``php.ini``, in the webserver directives or in ``.htaccess``. diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst index 2210c9f5b16..f6a19e2de80 100755 --- a/cookbook/form/form_collections.rst +++ b/cookbook/form/form_collections.rst @@ -258,7 +258,7 @@ great, your user can't actually add any new tags yet. This directive limits recursion to 100 calls which may not be enough for rendering the form in the template if you render the whole form at once (e.g ``form_widget(form)``). To fix this you can set this directive - to a higher value (either via a PHP ini file or via :phpfunction:`ini_set`, + to a higher value (either via a php.ini file or via :phpfunction:`ini_set`, for example in ``app/autoload.php``) or render each form field by hand using ``form_row``. diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index b9187691f2f..5996615cbaf 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -79,7 +79,7 @@ full TextMate string would look like this: Of course, since every developer uses a different IDE, it's better to set this on a system level. This can be done by setting the ``xdebug.file_link_format`` -PHP.ini value to the file link string. If this configuration value is set, then +php.ini value to the file link string. If this configuration value is set, then the ``ide`` option does not need to be specified. .. _reference-framework-test: diff --git a/reference/constraints/File.rst b/reference/constraints/File.rst index 8ece814cd7a..b082a8caf5d 100644 --- a/reference/constraints/File.rst +++ b/reference/constraints/File.rst @@ -217,7 +217,7 @@ uploadIniSizeErrorMessage **type**: ``string`` **default**: ``The file is too large. Allowed maximum size is {{ limit }}`` The message that is displayed if the uploaded file is larger than the ``upload_max_filesize`` -PHP.ini setting. +php.ini setting. uploadFormSizeErrorMessage ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/reference/requirements.rst b/reference/requirements.rst index 447b4f1d6e4..59be11f6245 100644 --- a/reference/requirements.rst +++ b/reference/requirements.rst @@ -22,7 +22,7 @@ Required * PHP needs to be a minimum version of PHP 5.3.3 * JSON needs to be enabled * ctype needs to be enabled -* Your PHP.ini needs to have the ``date.timezone`` setting +* Your php.ini needs to have the ``date.timezone`` setting Optional -------- @@ -35,7 +35,7 @@ Optional * POSIX needs to be enabled (only on \*nix) * Intl needs to be installed with ICU 4+ * APC 3.0.17+ (or another opcode cache needs to be installed) -* PHP.ini recommended settings +* php.ini recommended settings * ``short_open_tag = Off`` * ``magic_quotes_gpc = Off`` From 7cbcf20dd0ccee1d5e9775a3348bfebe948782bb Mon Sep 17 00:00:00 2001 From: Philipp Rieber Date: Tue, 5 Nov 2013 11:54:45 +0100 Subject: [PATCH 3/3] Add missing literal formatting to all usages of php.ini filename --- book/performance.rst | 2 +- components/http_foundation/introduction.rst | 2 +- components/http_foundation/session_configuration.rst | 6 +++--- components/http_foundation/sessions.rst | 2 +- cookbook/form/form_collections.rst | 2 +- reference/configuration/framework.rst | 2 +- reference/constraints/File.rst | 2 +- reference/requirements.rst | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/book/performance.rst b/book/performance.rst index 7ecc1da2937..c3f3debd559 100644 --- a/book/performance.rst +++ b/book/performance.rst @@ -37,7 +37,7 @@ to ensure that the cache is cleared whenever any source files change. Otherwise, the updates you've made won't be seen. For example, to disable these checks in APC, simply add ``apc.stat=0`` to -your php.ini configuration. +your ``php.ini`` configuration. .. index:: single: Performance; Autoloader diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst index bf2c4ac0fd4..a2cadf911d2 100644 --- a/components/http_foundation/introduction.rst +++ b/components/http_foundation/introduction.rst @@ -415,7 +415,7 @@ represented by a PHP callable instead of a string:: .. note:: The ``flush()`` function does not flush buffering. If ``ob_start()`` has - been called before or the ``output_buffering`` php.ini option is enabled, + been called before or the ``output_buffering`` ``php.ini`` option is enabled, you must call ``ob_flush()`` before ``flush()``. Additionally, PHP isn't the only layer that can buffer output. Your web diff --git a/components/http_foundation/session_configuration.rst b/components/http_foundation/session_configuration.rst index d6084fbc3b9..a55957b0986 100644 --- a/components/http_foundation/session_configuration.rst +++ b/components/http_foundation/session_configuration.rst @@ -26,7 +26,7 @@ So-called 'native' handlers, are save handlers which are either compiled into PHP or provided by PHP extensions, such as PHP-Sqlite, PHP-Memcached and so on. All native save handlers are internal to PHP and as such, have no public facing API. -They must be configured by php.ini directives, usually ``session.save_path`` and +They must be configured by ``php.ini`` directives, usually ``session.save_path`` and potentially other driver specific directives. Specific details can be found in docblock of the ``setOptions()`` method of each class. @@ -87,7 +87,7 @@ Configuring PHP Sessions ~~~~~~~~~~~~~~~~~~~~~~~~ The :class:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage` -can configure most of the php.ini configuration directives which are documented +can configure most of the ``php.ini`` configuration directives which are documented at `php.net/session.configuration`_. To configure these settings, pass the keys (omitting the initial ``session.`` part @@ -131,7 +131,7 @@ example if these were set to ``5/100`` respectively, it would mean a probability of 5%. Similarly, ``3/4`` would mean a 3 in 4 chance of being called, i.e. 75%. If the garbage collection handler is invoked, PHP will pass the value stored in -the php.ini directive ``session.gc_maxlifetime``. The meaning in this context is +the ``php.ini`` directive ``session.gc_maxlifetime``. The meaning in this context is that any stored session that was saved more than ``maxlifetime`` ago should be deleted. This allows one to expire records based on idle time. diff --git a/components/http_foundation/sessions.rst b/components/http_foundation/sessions.rst index 24d2b2b76c6..6e1ae379916 100644 --- a/components/http_foundation/sessions.rst +++ b/components/http_foundation/sessions.rst @@ -50,7 +50,7 @@ Quick example:: .. caution:: - Symfony sessions are incompatible with php.ini directive ``session.auto_start = 1`` + Symfony sessions are incompatible with ``php.ini`` directive ``session.auto_start = 1`` This directive should be turned off in ``php.ini``, in the webserver directives or in ``.htaccess``. diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst index f6a19e2de80..675667bfbdc 100755 --- a/cookbook/form/form_collections.rst +++ b/cookbook/form/form_collections.rst @@ -258,7 +258,7 @@ great, your user can't actually add any new tags yet. This directive limits recursion to 100 calls which may not be enough for rendering the form in the template if you render the whole form at once (e.g ``form_widget(form)``). To fix this you can set this directive - to a higher value (either via a php.ini file or via :phpfunction:`ini_set`, + to a higher value (either via a ``php.ini`` file or via :phpfunction:`ini_set`, for example in ``app/autoload.php``) or render each form field by hand using ``form_row``. diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 5996615cbaf..985ac5938c2 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -79,7 +79,7 @@ full TextMate string would look like this: Of course, since every developer uses a different IDE, it's better to set this on a system level. This can be done by setting the ``xdebug.file_link_format`` -php.ini value to the file link string. If this configuration value is set, then +``php.ini`` value to the file link string. If this configuration value is set, then the ``ide`` option does not need to be specified. .. _reference-framework-test: diff --git a/reference/constraints/File.rst b/reference/constraints/File.rst index b082a8caf5d..6cfc87c4e34 100644 --- a/reference/constraints/File.rst +++ b/reference/constraints/File.rst @@ -217,7 +217,7 @@ uploadIniSizeErrorMessage **type**: ``string`` **default**: ``The file is too large. Allowed maximum size is {{ limit }}`` The message that is displayed if the uploaded file is larger than the ``upload_max_filesize`` -php.ini setting. +``php.ini`` setting. uploadFormSizeErrorMessage ~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/reference/requirements.rst b/reference/requirements.rst index 59be11f6245..39ddfa25a65 100644 --- a/reference/requirements.rst +++ b/reference/requirements.rst @@ -22,7 +22,7 @@ Required * PHP needs to be a minimum version of PHP 5.3.3 * JSON needs to be enabled * ctype needs to be enabled -* Your php.ini needs to have the ``date.timezone`` setting +* Your ``php.ini`` needs to have the ``date.timezone`` setting Optional -------- @@ -35,7 +35,7 @@ Optional * POSIX needs to be enabled (only on \*nix) * Intl needs to be installed with ICU 4+ * APC 3.0.17+ (or another opcode cache needs to be installed) -* php.ini recommended settings +* ``php.ini`` recommended settings * ``short_open_tag = Off`` * ``magic_quotes_gpc = Off``