diff options
| author | jvoisin | 2018-01-17 14:53:40 +0100 |
|---|---|---|
| committer | jvoisin | 2018-01-17 14:53:40 +0100 |
| commit | c473be13687ebd98c328f390d936be311dae7db6 (patch) | |
| tree | 135d31682ca0a382fc417f1d008c9ee8bcd49d5d | |
| parent | bd02d0689190f526c99eee9b35c1335bd96a74af (diff) | |
Our configuration files are ending in .rules, not .ini
This commit fixes the documentation, our shipped configuration files,
and the related tests.
Thanks to @remicollet for the tip
| -rw-r--r-- | config/default.rules (renamed from config/default.ini) | 0 | ||||
| -rw-r--r-- | config/examples.rules (renamed from config/examples.ini) | 0 | ||||
| -rw-r--r-- | doc/source/config.rst | 6 | ||||
| -rw-r--r-- | src/tests/example_configuration.phpt | 2 | ||||
| -rw-r--r-- | src/tests/inexistent_conf_file_list.phpt | 2 | ||||
| -rw-r--r-- | src/tests/shipped_configuration.phpt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/config/default.ini b/config/default.rules index 88398c1..88398c1 100644 --- a/config/default.ini +++ b/config/default.rules | |||
diff --git a/config/examples.ini b/config/examples.rules index 664a67a..664a67a 100644 --- a/config/examples.ini +++ b/config/examples.rules | |||
diff --git a/doc/source/config.rst b/doc/source/config.rst index 794d8b0..c7e1346 100644 --- a/doc/source/config.rst +++ b/doc/source/config.rst | |||
| @@ -4,10 +4,10 @@ Configuration | |||
| 4 | Since PHP *ini-like* configuration model isn't flexible enough, | 4 | Since PHP *ini-like* configuration model isn't flexible enough, |
| 5 | Snuffleupagus is using its own format in the file specified by | 5 | Snuffleupagus is using its own format in the file specified by |
| 6 | the directive ``sp.configuration_file`` (in your ``php.ini`` file), | 6 | the directive ``sp.configuration_file`` (in your ``php.ini`` file), |
| 7 | like ``sp.configuration_file=/etc/php/conf.d/snuffleupagus.ini``. | 7 | like ``sp.configuration_file=/etc/php/conf.d/snuffleupagus.rules``. |
| 8 | 8 | ||
| 9 | You can use the ``,`` separator to include multiple configuration files : | 9 | You can use the ``,`` separator to include multiple configuration files : |
| 10 | ``sp.configuration_file=/etc/php/conf.d/snuffleupagus.ini,/etc/php/conf.d/sp_wordpress.ini`` | 10 | ``sp.configuration_file=/etc/php/conf.d/snuffleupagus.rules,/etc/php/conf.d/sp_wordpress.rules`` |
| 11 | 11 | ||
| 12 | Options are chainable by using dots (``.``) and string parameters | 12 | Options are chainable by using dots (``.``) and string parameters |
| 13 | **must** be quoted, while booleans and integers aren't. | 13 | **must** be quoted, while booleans and integers aren't. |
| @@ -399,5 +399,5 @@ The following rules will: | |||
| 399 | Miscellaneous examples | 399 | Miscellaneous examples |
| 400 | """""""""""""""""""""" | 400 | """""""""""""""""""""" |
| 401 | 401 | ||
| 402 | .. literalinclude:: ../../config/examples.ini | 402 | .. literalinclude:: ../../config/examples.rules |
| 403 | :language: python | 403 | :language: python |
diff --git a/src/tests/example_configuration.phpt b/src/tests/example_configuration.phpt index 74bdb49..6c2e82d 100644 --- a/src/tests/example_configuration.phpt +++ b/src/tests/example_configuration.phpt | |||
| @@ -3,7 +3,7 @@ Shipped configuration | |||
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php if (!extension_loaded("snuffleupagus")) die "skip"; ?> | 4 | <?php if (!extension_loaded("snuffleupagus")) die "skip"; ?> |
| 5 | --INI-- | 5 | --INI-- |
| 6 | sp.configuration_file={PWD}/../../config/examples.ini | 6 | sp.configuration_file={PWD}/../../config/examples.rules |
| 7 | --FILE-- | 7 | --FILE-- |
| 8 | <?php | 8 | <?php |
| 9 | ob_start(); | 9 | ob_start(); |
diff --git a/src/tests/inexistent_conf_file_list.phpt b/src/tests/inexistent_conf_file_list.phpt index afb77a2..2f6e204 100644 --- a/src/tests/inexistent_conf_file_list.phpt +++ b/src/tests/inexistent_conf_file_list.phpt | |||
| @@ -3,7 +3,7 @@ Non-existent configuration file in a list | |||
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?> | 4 | <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?> |
| 5 | --INI-- | 5 | --INI-- |
| 6 | sp.configuration_file={PWD}/../../config/default.ini,{PWD}/non_existent_configuration_file | 6 | sp.configuration_file={PWD}/../../config/default.rules,{PWD}/non_existent_configuration_file |
| 7 | --FILE-- | 7 | --FILE-- |
| 8 | <?php ?> | 8 | <?php ?> |
| 9 | --EXPECTF-- | 9 | --EXPECTF-- |
diff --git a/src/tests/shipped_configuration.phpt b/src/tests/shipped_configuration.phpt index c060a85..dd6b92b 100644 --- a/src/tests/shipped_configuration.phpt +++ b/src/tests/shipped_configuration.phpt | |||
| @@ -3,7 +3,7 @@ Shipped configuration | |||
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php if (!extension_loaded("snuffleupagus")) die "skip"; ?> | 4 | <?php if (!extension_loaded("snuffleupagus")) die "skip"; ?> |
| 5 | --INI-- | 5 | --INI-- |
| 6 | sp.configuration_file={PWD}/../../config/default.ini | 6 | sp.configuration_file={PWD}/../../config/default.rules |
| 7 | --FILE-- | 7 | --FILE-- |
| 8 | <?php | 8 | <?php |
| 9 | system("echo 0"); | 9 | system("echo 0"); |
