Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 3ec9471

Browse files
fabpotfabpot
committed
Merge branch '2.5'
* 2.5: [WIP] Adding a quick note explaining paramters.yml.dist a little updated VENDORS for 2.5.5 Add a HiDPI favicon.
2 parents 83b9639 + ba22a56 commit 3ec9471

File tree

3 files changed

+32
-29
lines changed

3 files changed

+32
-29
lines changed

‎app/SymfonyRequirements.php

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,25 @@ class Requirement
4141
/**
4242
* Constructor that initializes the requirement.
4343
*
44-
* @param Boolean $fulfilled Whether the requirement is fulfilled
44+
* @param bool $fulfilled Whether the requirement is fulfilled
4545
* @param string $testMessage The message for testing the requirement
4646
* @param string $helpHtml The help text formatted in HTML for resolving the problem
4747
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
48-
* @param Boolean $optional Whether this is only an optional recommendation not a mandatory requirement
48+
* @param bool $optional Whether this is only an optional recommendation not a mandatory requirement
4949
*/
5050
public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false)
5151
{
52-
$this->fulfilled = (Boolean) $fulfilled;
52+
$this->fulfilled = (bool) $fulfilled;
5353
$this->testMessage = (string) $testMessage;
5454
$this->helpHtml = (string) $helpHtml;
5555
$this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText;
56-
$this->optional = (Boolean) $optional;
56+
$this->optional = (bool) $optional;
5757
}
5858

5959
/**
6060
* Returns whether the requirement is fulfilled.
6161
*
62-
* @return Boolean true if fulfilled, otherwise false
62+
* @return bool true if fulfilled, otherwise false
6363
*/
6464
public function isFulfilled()
6565
{
@@ -99,7 +99,7 @@ public function getHelpHtml()
9999
/**
100100
* Returns whether this is only an optional recommendation and not a mandatory requirement.
101101
*
102-
* @return Boolean true if optional, false if mandatory
102+
* @return bool true if optional, false if mandatory
103103
*/
104104
public function isOptional()
105105
{
@@ -117,16 +117,16 @@ class PhpIniRequirement extends Requirement
117117
/**
118118
* Constructor that initializes the requirement.
119119
*
120-
* @param string $cfgName The configuration name used for ini_get()
121-
* @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
120+
* @param string $cfgName The configuration name used for ini_get()
121+
* @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false,
122122
or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
123-
* @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
123+
* @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
124124
This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
125125
Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
126-
* @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
127-
* @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
128-
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
129-
* @param Boolean $optional Whether this is only an optional recommendation not a mandatory requirement
126+
* @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived)
127+
* @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived)
128+
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
129+
* @param bool $optional Whether this is only an optional recommendation not a mandatory requirement
130130
*/
131131
public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false)
132132
{
@@ -193,7 +193,7 @@ public function add(Requirement $requirement)
193193
/**
194194
* Adds a mandatory requirement.
195195
*
196-
* @param Boolean $fulfilled Whether the requirement is fulfilled
196+
* @param bool $fulfilled Whether the requirement is fulfilled
197197
* @param string $testMessage The message for testing the requirement
198198
* @param string $helpHtml The help text formatted in HTML for resolving the problem
199199
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
@@ -206,7 +206,7 @@ public function addRequirement($fulfilled, $testMessage, $helpHtml, $helpText =
206206
/**
207207
* Adds an optional recommendation.
208208
*
209-
* @param Boolean $fulfilled Whether the recommendation is fulfilled
209+
* @param bool $fulfilled Whether the recommendation is fulfilled
210210
* @param string $testMessage The message for testing the recommendation
211211
* @param string $helpHtml The help text formatted in HTML for resolving the problem
212212
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
@@ -219,15 +219,15 @@ public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText
219219
/**
220220
* Adds a mandatory requirement in form of a php.ini configuration.
221221
*
222-
* @param string $cfgName The configuration name used for ini_get()
223-
* @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
222+
* @param string $cfgName The configuration name used for ini_get()
223+
* @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false,
224224
or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
225-
* @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
225+
* @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
226226
This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
227227
Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
228-
* @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
229-
* @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
230-
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
228+
* @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived)
229+
* @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived)
230+
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
231231
*/
232232
public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
233233
{
@@ -237,15 +237,15 @@ public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence =
237237
/**
238238
* Adds an optional recommendation in form of a php.ini configuration.
239239
*
240-
* @param string $cfgName The configuration name used for ini_get()
241-
* @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false,
240+
* @param string $cfgName The configuration name used for ini_get()
241+
* @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false,
242242
or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
243-
* @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
243+
* @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
244244
This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
245245
Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
246-
* @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
247-
* @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
248-
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
246+
* @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived)
247+
* @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived)
248+
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
249249
*/
250250
public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
251251
{
@@ -343,7 +343,7 @@ public function getFailedRecommendations()
343343
/**
344344
* Returns whether a php.ini configuration is not correct.
345345
*
346-
* @return Boolean php.ini configuration problem?
346+
* @return bool php.ini configuration problem?
347347
*/
348348
public function hasPhpIniConfigIssue()
349349
{
@@ -405,7 +405,7 @@ public function __construct()
405405
$this->addRequirement(
406406
is_dir(__DIR__.'/../vendor/composer'),
407407
'Vendor libraries must be installed',
408-
'Vendor libraries are missing. Install composer following instructions from <a href="http://getcomposer.org/">http://getcomposer.org/</a>. ' .
408+
'Vendor libraries are missing. Install composer following instructions from <a href="http://getcomposer.org/">http://getcomposer.org/</a>. '.
409409
'Then run "<strong>php composer.phar install</strong>" to install them.'
410410
);
411411

‎app/config/parameters.yml.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# This file is a "template" of what your parameters.yml file should look like
12
parameters:
23
database_driver: pdo_mysql
34
database_host: 127.0.0.1
@@ -14,6 +15,8 @@ parameters:
1415
mailer_password: ~
1516

1617
locale: en
18+
19+
# A secret key that's used to generate certain security-related tokens
1720
secret: ThisTokenIsNotSoSecretChangeIt
1821

1922
debug_toolbar: true

‎web/favicon.ico

5.24 KB
Binary file not shown.

0 commit comments

Comments
 (0)