Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history 
Fixed files permissions
  • Loading branch information
Grzegorz Drozd committed Feb 28, 2013
144 parents 9691cce + ddc5b11 + 203f4f2 + f755a1b + 7b4bdc5 + de1dabc + cffd7da + e68b46a + 6a4a61e + a495238 + 22ee4fd + 7c48789 + 88fc985 + 33867a8 + 72cc708 + 1253b9d + b527198 + 9f385cb + 9681d38 + 9ff4ea7 + 9dcc02b + a3b5a44 + 49aa6e1 + 785d144 + 6cb9145 + 98ba294 + 1a26005 + 6a37670 + 53069e2 + cdc28f8 + 7ed9b6d + 6aa8b3f + b08f0db + c6ffcad + 2e788ed + 5fa8668 + 331098b + 11a5300 + d15662e + a652577 + 113da58 + ac8c434 + 51dd55f + b8f65f9 + 5ab3ccd + 3c9d616 + 34eee47 + 1fc6a29 + 0f06888 + 781c1e1 + bfb1248 + adb0888 + 20476b6 + f0f3028 + fd934a8 + 039bd26 + 70f3e5a + 3d9849b + 118afdb + 029c839 + 31a4435 + fa239e0 + 18c2969 + 28b9d7b + 34e166a + 9e19c9d + b6b709b + 1f178dc + 19afffe + 3b1a256 + a01e488 + 6bd5417 + 7884984 + d7ead03 + ad447f0 + 30abd77 + 886c7dd + 0426e59 + 41bb0b6 + 48830b0 + d6e3cec + 3f64575 + 47056cf + 93da274 + 41ff6ee + 4d95164 + b49f56a + d9ca3c4 + eff94af + baa6f68 + b8d6e5f + cf90e76 + a38e673 + 1645624 + 0f36602 + 32da7d8 + 9cd65f3 + 10a2ceb + f8a3f38 + 7b59c4b + 281109c + e15b4b2 + 00a7ba9 + d3f35c0 + e89516e + cbf495f + 89118d6 + 4f9b8b7 + d51ad32 + bdfd7d8 + 0dc32e4 + ca27a0e + b0b5deb + 8f5f165 + e85eb90 + 8f6f830 + 6a31d61 + 54ae670 + 1cad3f0 + beb876e + d725de0 + bf57c7d + 822964a + 669aa66 + 76422ec + 62cdf38 + cbe43a2 + 6b3919c + 832c96f + 72e3bd6 + 5cfa5d3 + f012f21 + 49e3436 + 465b2ed + 91cc8bb + 86b4350 + e32c680 + d82c755 + b9aa141 + ab2eabe + dc44bfd + a532720 + da21aec + c5778b9 commit 4b52b1f
Show file tree
Hide file tree
Showing 39 changed files with 262 additions and 278 deletions.
18 changes: 14 additions & 4 deletions .php_cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
<?php
echo "Loading " . __FILE__ . "\n";
$finder = Symfony\CS\Finder\DefaultFinder::create()
->notName('TestSampleClass10.php')
->in(__DIR__);
return Symfony\CS\Config\Config::create()
->finder($finder);
->exclude('demos')
->exclude('resources')
->filter(function (SplFileInfo $file) {
if (strstr($file->getPath(), 'compatibility')) {
return false;
}
})
->in(__DIR__ . '/library')
->in(__DIR__ . '/tests')
->in(__DIR__ . '/bin');
$config = Symfony\CS\Config\Config::create();
$config->fixers(Symfony\CS\FixerInterface::PSR2_LEVEL);
$config->finder($finder);
return $config;
12 changes: 6 additions & 6 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ php:
- 5.3.3
- 5.3
- 5.4
- 5.5

matrix:
allow_failures:
- php: 5.5

before_install:
- cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
- composer install --dev --prefer-source
- wget http://cs.sensiolabs.org/get/php-cs-fixer.phar

script:
- php ./tests/run-tests.php
- output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 library); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
- output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 tests); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
- output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 bin); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
- ant travis -keep-going

notifications:
irc: "irc.freenode.org#zftalk.dev"
Expand Down
3 changes: 0 additions & 3 deletions languages/ar/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/ar/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/bg/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/bg/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/cs/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/cs/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/de/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/de/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/en/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
15 changes: 12 additions & 3 deletions languages/en/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down Expand Up @@ -188,6 +185,18 @@
"File '%value%' was not found" => "File '%value%' was not found",
"Unknown error while uploading file '%value%'" => "Unknown error while uploading file '%value%'",

// Zend_Validator_File_UploadFile
"File exceeds the defined ini size" => "File exceeds the defined ini size",
"File exceeds the defined form size" => "File exceeds the defined form size",
"File was only partially uploaded" => "File was only partially uploaded",
"File was not uploaded" => "File was not uploaded",
"No temporary directory was found for file" => "No temporary directory was found for file",
"File can't be written" => "File can't be written",
"A PHP extension returned an error while uploading the file" => "A PHP extension returned an error while uploading the file",
"File was illegally uploaded. This could be a possible attack" => "File was illegally uploaded. This could be a possible attack",
"File was not found" => "File was not found",
"Unknown error while uploading file" => "Unknown error while uploading file",

// Zend_Validator_File_WordCount
"Too much words, maximum '%max%' are allowed but '%count%' were counted" => "Too much words, maximum '%max%' are allowed but '%count%' were counted",
"Too less words, minimum '%min%' are expected but '%count%' were counted" => "Too less words, minimum '%min%' are expected but '%count%' were counted",
Expand Down
3 changes: 0 additions & 3 deletions languages/es/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/fi/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/fr/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
17 changes: 7 additions & 10 deletions languages/fr/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down Expand Up @@ -81,7 +78,7 @@
// Zend_Validator_DateStep
"Invalid type given. String, integer, array or DateTime expected" => "Entrée invalide. Chaîne, entier, tableau ou DateTime attendu",
"The input does not appear to be a valid date" => "L'entrée ne semble pas être une date valide",
"The input is not a valid step" => "L'entrée n'est pas un intervalle valide",
"The input is not a valid step" => "L'entrée n'est pas une step valide",

// Zend_Validator_Db_AbstractDb
"No record matching the input was found" => "Aucun enregistrement trouvé",
Expand All @@ -99,7 +96,7 @@
"'%hostname%' does not appear to have any valid MX or A records for the email address" => "'%hostname%' ne semble pas avoir d'enregistrement MX valide pour l'adresse email",
"'%hostname%' is not in a routable network segment. The email address should not be resolved from public network" => "'%hostname%' n'est pas dans un segment réseau routable. L'adresse email ne devrait pas être résolue depuis un réseau public.",
"'%localPart%' can not be matched against dot-atom format" => "'%localPart%' ne correspond pas au format dot-atom",
"'%localPart%' can not be matched against quoted-string format" => "'%localPart%' ne correspond pas à une chaîne entre quotes",
"'%localPart%' can not be matched against quoted-string format" => "'%localPart%' ne correspond pas au format quoted-string",
"'%localPart%' is not a valid local part for the email address" => "'%localPart%' n'est pas une partie locale valide pour l'adresse email",
"The input exceeds the allowed length" => "L'entrée dépasse la taille autorisée",

Expand Down Expand Up @@ -178,7 +175,7 @@
"File '%value%' is not readable or does not exist" => "Le fichier '%value%' n'est pas lisible ou n'existe pas",

// Zend_Validator_File_Upload
"File '%value%' exceeds the defined ini size" => "Le fichier '%value%' dépasse la taille définie dans le fichier INI",
"File '%value%' exceeds the defined ini size" => "File '%value%' dépasse la taille défini dans le fichier INI",
"File '%value%' exceeds the defined form size" => "Le fichier '%value%' dépasse la taille définie dans le formulaire",
"File '%value%' was only partially uploaded" => "Le fichier '%value%' n'a été que partiellement envoyé",
"File '%value%' was not uploaded" => "Le fichier '%value%' n'a pas été envoyé",
Expand Down Expand Up @@ -250,11 +247,11 @@
"There was an internal error while using the pattern '%pattern%'" => "Une erreur interne est survenue avec l'expression '%pattern%'",

// Zend_Validator_Sitemap_Changefreq
"The input is not a valid sitemap changefreq" => "L'entrée n'est pas une valeur de fréquence de changement de sitemap valide",
"The input is not a valid sitemap changefreq" => "L'entrée n'est pas une valeur de fréquence de sitemap valide",
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",

// Zend_Validator_Sitemap_Lastmod
"The input is not a valid sitemap lastmod" => "L'entrée n'est pas une date de dernière modification de sitemap valide",
"The input is not a valid sitemap lastmod" => "L'entrée n'est pas une date de modification de sitemap valide",
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",

// Zend_Validator_Sitemap_Loc
Expand All @@ -267,11 +264,11 @@

// Zend_Validator_Step
"Invalid value given. Scalar expected" => "Type invalide. Scalaire attendu",
"The input is not a valid step" => "L'entrée n'est pas un intervalle valide",
"The input is not a valid step" => "L'entrée n'est pas un multiple valide",

// Zend_Validator_StringLength
"Invalid type given. String expected" => "Type invalide. Chaîne attendue",
"The input is less than %min% characters long" => "L'entrée contient moins de %min% caractères",
"The input is less than %min% characters long" => "L'entrée conteint moins de %min% caractères",
"The input is more than %max% characters long" => "L'entrée contient plus de %max% caractères",

// Zend_Validator_Uri
Expand Down
3 changes: 0 additions & 3 deletions languages/hr/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/it/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
15 changes: 12 additions & 3 deletions languages/it/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down Expand Up @@ -188,6 +185,18 @@
"File '%value%' was not found" => "Il file '%value%' non è stato trovato",
"Unknown error while uploading file '%value%'" => "Errore sconosciuto durante il caricamento del file '%value%'",

// Zend_Validator_File_UploadFile
"File exceeds the defined ini size" => "Il file eccede la dimensione definita nell'ini",
"File exceeds the defined form size" => "Il file eccede la dimensione definita nella form",
"File was only partially uploaded" => "Il file è stato caricato solo parzialmente",
"File was not uploaded" => "Il file non è stato caricato",
"No temporary directory was found for file" => "Non è stata trovata una directory temporanea per il file",
"File can't be written" => "Il file non può essere scritto",
"A PHP extension returned an error while uploading the file" => "Un'estensione di PHP ha generato un errore durante il caricamento del file",
"File was illegally uploaded. This could be a possible attack" => "Il file è stato caricato irregolarmente. Potrebbe trattarsi di un attacco",
"File was not found" => "Il file non è stato trovato",
"Unknown error while uploading file" => "Errore sconosciuto durante il caricamento del file",

// Zend_Validator_File_WordCount
"Too much words, maximum '%max%' are allowed but '%count%' were counted" => "Il file contiene troppe parole, ne sono consentite massimo '%max%' ma ne sono state contate '%count%'",
"Too less words, minimum '%min%' are expected but '%count%' were counted" => "Il file contiene troppe poche parole, ne sono consentite minimo '%min%' ma ne sono state contate '%count%'",
Expand Down
3 changes: 0 additions & 3 deletions languages/ja/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/nl/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
3 changes: 0 additions & 3 deletions languages/no/Zend_Captcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translate
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
5 changes: 1 addition & 4 deletions languages/no/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down Expand Up @@ -230,7 +227,7 @@
"'%value%' is not less than '%max%'" => "'%value%' er ikke mindre enn '%max%'",

// Zend_Validate_NotEmpty
"Invalid type given. String, integer, float, boolean or array expected" => "Ugyldig type gitt. Forventet streng, heltall, flyt-tall, boolean eller matrise",
"Invalid type given. String, integer, float, boolean or array expected" => "Ugyldig type gitt. Forventet streng, heltall, flyt-tall, boolean eller matrise",
"Value is required and can't be empty" => "Verdi er påkrevd, og kan ikke være tomt",

// Zend_Validate_PostCode
Expand Down
3 changes: 0 additions & 3 deletions languages/pl/Zend_Validate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Translator
* @subpackage Resource
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down
Loading

0 comments on commit 4b52b1f

Please sign in to comment.