From 73f01455855d4731cb8c8db926ff63880323cdfd Mon Sep 17 00:00:00 2001 From: Lucas Date: Fri, 7 Mar 2014 13:57:46 +0100 Subject: [PATCH 1/4] Add PHPUnit 4.0.* to require-dev --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 32cb3991..cabc1614 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "phpunit/phpunit": "4.0.*" + }, "autoload": { "psr-0": { "Faker": "src/", From 0b7de5c0e601d5728abe536b90b257f1070da044 Mon Sep 17 00:00:00 2001 From: David Stensland Date: Mon, 10 Mar 2014 09:44:13 -0400 Subject: [PATCH 2/4] Add php_codesniffer and run before tests. run vendor PHPUnit, too --- .travis.yml | 2 +- Makefile | 10 ++++++++++ composer.json | 5 +++-- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 Makefile diff --git a/.travis.yml b/.travis.yml index adae51d6..e71aaaa7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,4 +14,4 @@ before_script: - composer self-update - composer install --dev -script: phpunit +script: make sniff test diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..f1776c92 --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +vendor/autoload.php: + composer install + +.PHONY: sniff +sniff: vendor/autoload.php + vendor/bin/phpcs --standard=PSR2 src -n + +.PHONY: test +test: vendor/autoload.php + vendor/bin/phpunit diff --git a/composer.json b/composer.json index cabc1614..ad94d4d8 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,9 @@ "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.0.*" - }, + "phpunit/phpunit": "4.0.*", + "squizlabs/php_codesniffer": "~1.5" + }, "autoload": { "psr-0": { "Faker": "src/", From 041cecffd6313752b7d0975e26e47395430b9b04 Mon Sep 17 00:00:00 2001 From: David Stensland Date: Mon, 10 Mar 2014 15:35:46 -0400 Subject: [PATCH 3/4] psr-2 fixes --- src/Faker/Guesser/Name.php | 60 +++++++++++++++----- src/Faker/NullGenerator.php | 1 - src/Faker/ORM/Doctrine/ColumnTypeGuesser.php | 38 +++++++++---- src/Faker/ORM/Doctrine/EntityPopulator.php | 7 +-- src/Faker/ORM/Doctrine/Populator.php | 1 - src/Faker/ORM/Mandango/ColumnTypeGuesser.php | 20 +++++-- src/Faker/ORM/Mandango/EntityPopulator.php | 7 +-- src/Faker/ORM/Propel/ColumnTypeGuesser.php | 52 ++++++++++++----- src/Faker/ORM/Propel/EntityPopulator.php | 9 +-- src/Faker/ORM/Propel/Populator.php | 1 - src/Faker/Provider/Barcode.php | 2 +- src/Faker/Provider/Payment.php | 15 +++-- src/Faker/Provider/Text.php | 4 +- src/Faker/Provider/Uuid.php | 13 ++++- src/Faker/Provider/bn_BD/Address.php | 3 - src/Faker/Provider/bn_BD/Company.php | 1 - src/Faker/Provider/bn_BD/Person.php | 1 - src/Faker/Provider/bn_BD/PhoneNumber.php | 3 - src/Faker/Provider/el_GR/Person.php | 1 - src/Faker/Provider/en_AU/Address.php | 1 - src/Faker/Provider/en_AU/PhoneNumber.php | 1 - src/Faker/Provider/en_ZA/Person.php | 1 - src/Faker/Provider/fr_FR/Company.php | 8 ++- src/Faker/Provider/ja_JP/Person.php | 1 - src/Faker/Provider/me_ME/Address.php | 1 - src/Faker/Provider/me_ME/Company.php | 1 - src/Faker/Provider/pl_PL/Company.php | 2 +- src/Faker/Provider/pl_PL/Person.php | 4 +- src/Faker/Provider/pt_BR/Internet.php | 7 ++- src/Faker/Provider/tr_TR/Address.php | 1 - src/Faker/Provider/zh_CN/Company.php | 1 - src/autoload.php | 2 +- 32 files changed, 178 insertions(+), 92 deletions(-) diff --git a/src/Faker/Guesser/Name.php b/src/Faker/Guesser/Name.php index 815cd31f..604cce18 100644 --- a/src/Faker/Guesser/Name.php +++ b/src/Faker/Guesser/Name.php @@ -18,45 +18,75 @@ class Name $name = Base::toLower($name); $generator = $this->generator; if (preg_match('/^is[_A-Z]/', $name)) { - return function() use ($generator) { return $generator->boolean; }; + return function () use ($generator) { + return $generator->boolean; + }; } if (preg_match('/(_a|A)t$/', $name)) { - return function() use ($generator) { return $generator->dateTime; }; + return function () use ($generator) { + return $generator->dateTime; + }; } switch ($name) { case 'first_name': case 'firstname': - return function() use ($generator) { return $generator->firstName; }; + return function () use ($generator) { + return $generator->firstName; + }; case 'last_name': case 'lastname': - return function() use ($generator) { return $generator->lastName; }; + return function () use ($generator) { + return $generator->lastName; + }; case 'username': case 'login': - return function() use ($generator) { return $generator->userName; }; + return function () use ($generator) { + return $generator->userName; + }; case 'email': - return function() use ($generator) { return $generator->email; }; + return function () use ($generator) { + return $generator->email; + }; case 'phone_number': case 'phonenumber': case 'phone': - return function() use ($generator) { return $generator->phoneNumber; }; + return function () use ($generator) { + return $generator->phoneNumber; + }; case 'address': - return function() use ($generator) { return $generator->address; }; + return function () use ($generator) { + return $generator->address; + }; case 'city': - return function() use ($generator) { return $generator->city; }; + return function () use ($generator) { + return $generator->city; + }; case 'streetaddress': - return function() use ($generator) { return $generator->streetAddress; }; + return function () use ($generator) { + return $generator->streetAddress; + }; case 'postcode': case 'zipcode': - return function() use ($generator) { return $generator->postcode; }; + return function () use ($generator) { + return $generator->postcode; + }; case 'state': - return function() use ($generator) { return $generator->state; }; + return function () use ($generator) { + return $generator->state; + }; case 'country': - return function() use ($generator) { return $generator->country; }; + return function () use ($generator) { + return $generator->country; + }; case 'title': - return function() use ($generator) { return $generator->sentence; }; + return function () use ($generator) { + return $generator->sentence; + }; case 'body': case 'summary': - return function() use ($generator) { return $generator->text; }; + return function () use ($generator) { + return $generator->text; + }; } } } diff --git a/src/Faker/NullGenerator.php b/src/Faker/NullGenerator.php index e537166d..ac5c5526 100644 --- a/src/Faker/NullGenerator.php +++ b/src/Faker/NullGenerator.php @@ -18,5 +18,4 @@ class NullGenerator { return null; } - } diff --git a/src/Faker/ORM/Doctrine/ColumnTypeGuesser.php b/src/Faker/ORM/Doctrine/ColumnTypeGuesser.php index 10d8bae8..899dc95b 100644 --- a/src/Faker/ORM/Doctrine/ColumnTypeGuesser.php +++ b/src/Faker/ORM/Doctrine/ColumnTypeGuesser.php @@ -19,29 +19,47 @@ class ColumnTypeGuesser $type = $class->getTypeOfField($fieldName); switch ($type) { case 'boolean': - return function() use ($generator) { return $generator->boolean; }; + return function () use ($generator) { + return $generator->boolean; + }; case 'decimal': $size = isset($class->fieldMappings[$fieldName]['precision']) ? $class->fieldMappings[$fieldName]['precision'] : 2; - return function() use ($generator, $size) { return $generator->randomNumber($size + 2) / 100; }; + return function () use ($generator, $size) { + return $generator->randomNumber($size + 2) / 100; + }; case 'smallint': - return function() { return mt_rand(0,65535); }; + return function () { + return mt_rand(0, 65535); + }; case 'integer': - return function() { return mt_rand(0,intval('2147483647')); }; + return function () { + return mt_rand(0, intval('2147483647')); + }; case 'bigint': - return function() { return mt_rand(0,intval('18446744073709551615')); }; + return function () { + return mt_rand(0, intval('18446744073709551615')); + }; case 'float': - return function() { return mt_rand(0,intval('4294967295'))/mt_rand(1,intval('4294967295')); }; + return function () { + return mt_rand(0, intval('4294967295'))/mt_rand(1, intval('4294967295')); + }; case 'string': $size = isset($class->fieldMappings[$fieldName]['length']) ? $class->fieldMappings[$fieldName]['length'] : 255; - return function() use ($generator, $size) { return $generator->text($size); }; + return function () use ($generator, $size) { + return $generator->text($size); + }; case 'text': - return function() use ($generator) { return $generator->text; }; + return function () use ($generator) { + return $generator->text; + }; case 'datetime': case 'date': - case 'time': - return function() use ($generator) { return $generator->datetime; }; + case 'time': + return function () use ($generator) { + return $generator->datetime; + }; default: // no smart way to guess what the user expects here return null; diff --git a/src/Faker/ORM/Doctrine/EntityPopulator.php b/src/Faker/ORM/Doctrine/EntityPopulator.php index 8cbe8e22..5ed8acbb 100644 --- a/src/Faker/ORM/Doctrine/EntityPopulator.php +++ b/src/Faker/ORM/Doctrine/EntityPopulator.php @@ -5,7 +5,6 @@ namespace Faker\ORM\Doctrine; use Doctrine\Common\Persistence\ObjectManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\ClassMetadata; -use Faker\ORM\Doctrine\ColumnTypeGuesser; /** * Service class for populating a table through a Doctrine Entity class. @@ -78,7 +77,7 @@ class EntityPopulator $formatters = array(); $nameGuesser = new \Faker\Guesser\Name($generator); $columnTypeGuesser = new ColumnTypeGuesser($generator); - foreach ($this->class->getFieldNames() AS $fieldName) { + foreach ($this->class->getFieldNames() as $fieldName) { if ($this->class->isIdentifier($fieldName) || !$this->class->hasField($fieldName)) { continue; } @@ -93,7 +92,7 @@ class EntityPopulator } } - foreach ($this->class->getAssociationNames() AS $assocName) { + foreach ($this->class->getAssociationNames() as $assocName) { if ($this->class->isCollectionValuedAssociation($assocName)) { continue; } @@ -113,7 +112,7 @@ class EntityPopulator } $index = 0; - $formatters[$assocName] = function($inserted) use ($relatedClass, &$index, $unique, $optional) { + $formatters[$assocName] = function ($inserted) use ($relatedClass, &$index, $unique, $optional) { if ($unique && isset($inserted[$relatedClass])) { $related = null; if (isset($inserted[$relatedClass][$index]) || !$optional) { diff --git a/src/Faker/ORM/Doctrine/Populator.php b/src/Faker/ORM/Doctrine/Populator.php index 957450ee..de97c519 100644 --- a/src/Faker/ORM/Doctrine/Populator.php +++ b/src/Faker/ORM/Doctrine/Populator.php @@ -75,5 +75,4 @@ class Populator return $insertedEntities; } - } diff --git a/src/Faker/ORM/Mandango/ColumnTypeGuesser.php b/src/Faker/ORM/Mandango/ColumnTypeGuesser.php index 9d5a1438..e64dc758 100644 --- a/src/Faker/ORM/Mandango/ColumnTypeGuesser.php +++ b/src/Faker/ORM/Mandango/ColumnTypeGuesser.php @@ -16,15 +16,25 @@ class ColumnTypeGuesser $generator = $this->generator; switch ($field['type']) { case 'boolean': - return function() use ($generator) { return $generator->boolean; }; + return function () use ($generator) { + return $generator->boolean; + }; case 'integer': - return function() { return mt_rand(0,intval('4294967295')); }; + return function () { + return mt_rand(0, intval('4294967295')); + }; case 'float': - return function() { return mt_rand(0,intval('4294967295'))/mt_rand(1,intval('4294967295')); }; + return function () { + return mt_rand(0, intval('4294967295'))/mt_rand(1, intval('4294967295')); + }; case 'string': - return function() use ($generator) { return $generator->text(255); }; + return function () use ($generator) { + return $generator->text(255); + }; case 'date': - return function() use ($generator) { return $generator->datetime; }; + return function () use ($generator) { + return $generator->datetime; + }; default: // no smart way to guess what the user expects here return null; diff --git a/src/Faker/ORM/Mandango/EntityPopulator.php b/src/Faker/ORM/Mandango/EntityPopulator.php index 6b97e5ae..061df77f 100644 --- a/src/Faker/ORM/Mandango/EntityPopulator.php +++ b/src/Faker/ORM/Mandango/EntityPopulator.php @@ -92,11 +92,8 @@ class EntityPopulator if (null !== $format) { $value = is_callable($format) ? $format($insertedEntities, $obj) : $format; - if ( - isset($metadata['fields'][$column]) - || - isset($metadata['referencesOne'][$column]) - ) { + if (isset($metadata['fields'][$column]) || + isset($metadata['referencesOne'][$column])) { $obj->set($column, $value); } diff --git a/src/Faker/ORM/Propel/ColumnTypeGuesser.php b/src/Faker/ORM/Propel/ColumnTypeGuesser.php index 20eab22a..cb3e4462 100644 --- a/src/Faker/ORM/Propel/ColumnTypeGuesser.php +++ b/src/Faker/ORM/Propel/ColumnTypeGuesser.php @@ -19,51 +19,77 @@ class ColumnTypeGuesser $generator = $this->generator; if ($column->isTemporal()) { if ($column->isEpochTemporal()) { - return function() use ($generator) { return $generator->dateTime; }; + return function () use ($generator) { + return $generator->dateTime; + }; } else { - return function() use ($generator) { return $generator->dateTimeAD; }; + return function () use ($generator) { + return $generator->dateTimeAD; + }; } } $type = $column->getType(); switch ($type) { case PropelColumnTypes::BOOLEAN: case PropelColumnTypes::BOOLEAN_EMU: - return function() use ($generator) { return $generator->boolean; }; + return function () use ($generator) { + return $generator->boolean; + }; case PropelColumnTypes::NUMERIC: case PropelColumnTypes::DECIMAL: $size = $column->getSize(); - return function() use ($generator, $size) { return $generator->randomNumber($size + 2) / 100; }; + return function () use ($generator, $size) { + return $generator->randomNumber($size + 2) / 100; + }; case PropelColumnTypes::TINYINT: - return function() { return mt_rand(0,127); }; + return function () { + return mt_rand(0, 127); + }; case PropelColumnTypes::SMALLINT: - return function() { return mt_rand(0,32767); }; + return function () { + return mt_rand(0, 32767); + }; case PropelColumnTypes::INTEGER: - return function() { return mt_rand(0,intval('2147483647')); }; + return function () { + return mt_rand(0, intval('2147483647')); + }; case PropelColumnTypes::BIGINT: - return function() { return mt_rand(0,intval('9223372036854775807')); }; + return function () { + return mt_rand(0, intval('9223372036854775807')); + }; case PropelColumnTypes::FLOAT: - return function() { return mt_rand(0,intval('2147483647'))/mt_rand(1,intval('2147483647')); }; + return function () { + return mt_rand(0, intval('2147483647'))/mt_rand(1, intval('2147483647')); + }; case PropelColumnTypes::DOUBLE: case PropelColumnTypes::REAL: - return function() { return mt_rand(0,intval('9223372036854775807'))/mt_rand(1,intval('9223372036854775807')); }; + return function () { + return mt_rand(0, intval('9223372036854775807'))/mt_rand(1, intval('9223372036854775807')); + }; case PropelColumnTypes::CHAR: case PropelColumnTypes::VARCHAR: case PropelColumnTypes::BINARY: case PropelColumnTypes::VARBINARY: $size = $column->getSize(); - return function() use ($generator, $size) { return $generator->text($size); }; + return function () use ($generator, $size) { + return $generator->text($size); + }; case PropelColumnTypes::LONGVARCHAR: case PropelColumnTypes::LONGVARBINARY: case PropelColumnTypes::CLOB: case PropelColumnTypes::CLOB_EMU: case PropelColumnTypes::BLOB: - return function() use ($generator) { return $generator->text; }; + return function () use ($generator) { + return $generator->text; + }; case PropelColumnTypes::ENUM: $valueSet = $column->getValueSet(); - return function() use ($generator, $valueSet) { return $generator->randomElement($valueSet); }; + return function () use ($generator, $valueSet) { + return $generator->randomElement($valueSet); + }; case PropelColumnTypes::OBJECT: case PropelColumnTypes::PHP_ARRAY: // no smart way to guess what the user expects here diff --git a/src/Faker/ORM/Propel/EntityPopulator.php b/src/Faker/ORM/Propel/EntityPopulator.php index 7d73db82..a83d8726 100644 --- a/src/Faker/ORM/Propel/EntityPopulator.php +++ b/src/Faker/ORM/Propel/EntityPopulator.php @@ -59,7 +59,9 @@ class EntityPopulator } if ($columnMap->isForeignKey()) { $relatedClass = $columnMap->getRelation()->getForeignTable()->getClassname(); - $formatters[$columnMap->getPhpName()] = function($inserted) use ($relatedClass) { return isset($inserted[$relatedClass]) ? $inserted[$relatedClass][mt_rand(0, count($inserted[$relatedClass]) - 1)] : null; }; + $formatters[$columnMap->getPhpName()] = function ($inserted) use ($relatedClass) { + return isset($inserted[$relatedClass]) ? $inserted[$relatedClass][mt_rand(0, count($inserted[$relatedClass]) - 1)] : null; + }; continue; } if ($columnMap->isPrimaryKey()) { @@ -125,7 +127,7 @@ class EntityPopulator foreach ($tableMap->getBehaviors() as $name => $params) { switch ($name) { case 'nested_set': - $modifiers['nested_set'] = function($obj, $inserted) use ($class, $generator) { + $modifiers['nested_set'] = function ($obj, $inserted) use ($class, $generator) { if (isset($inserted[$class])) { $queryClass = $class . 'Query'; $parent = $queryClass::create()->findPk($generator->randomElement($inserted[$class])); @@ -136,7 +138,7 @@ class EntityPopulator }; break; case 'sortable': - $modifiers['sortable'] = function($obj, $inserted) use ($class, $generator) { + $modifiers['sortable'] = function ($obj, $inserted) use ($class, $generator) { $maxRank = isset($inserted[$class]) ? count($inserted[$class]) : 0; $obj->insertAtRank(mt_rand(1, $maxRank + 1)); }; @@ -165,5 +167,4 @@ class EntityPopulator return $obj->getPrimaryKey(); } - } diff --git a/src/Faker/ORM/Propel/Populator.php b/src/Faker/ORM/Propel/Populator.php index c733ced1..067229bc 100644 --- a/src/Faker/ORM/Propel/Populator.php +++ b/src/Faker/ORM/Propel/Populator.php @@ -83,5 +83,4 @@ class Populator return \Propel::getConnection($peer::DATABASE_NAME, \Propel::CONNECTION_WRITE); } - } diff --git a/src/Faker/Provider/Barcode.php b/src/Faker/Provider/Barcode.php index fb01d998..62f676d4 100644 --- a/src/Faker/Provider/Barcode.php +++ b/src/Faker/Provider/Barcode.php @@ -7,7 +7,7 @@ namespace Faker\Provider; */ class Barcode extends \Faker\Provider\Base { - private function ean($length=13) + private function ean($length = 13) { $code = array(); for ($i = 0; $i < $length - 1; $i++) { diff --git a/src/Faker/Provider/Payment.php b/src/Faker/Provider/Payment.php index f711419e..c54ad1af 100644 --- a/src/Faker/Provider/Payment.php +++ b/src/Faker/Provider/Payment.php @@ -236,9 +236,15 @@ class Payment extends Base } switch ($class) { default: - case 'c': $result .= mt_rand(0, 100) <= 50 ? static::randomDigit() : strtoupper(static::randomLetter()); break; - case 'a': $result .= strtoupper(static::randomLetter()); break; - case 'n': $result .= static::randomDigit(); break; + case 'c': + $result .= mt_rand(0, 100) <= 50 ? static::randomDigit() : strtoupper(static::randomLetter()); + break; + case 'a': + $result .= strtoupper(static::randomLetter()); + break; + case 'n': + $result .= static::randomDigit(); + break; } } @@ -252,8 +258,9 @@ class Payment extends Base $checksum = (10 * $checksum + (int) $tempResult[$i]) % 97; } $checksum = 98 - $checksum; - if ($checksum < 10) + if ($checksum < 10) { $checksum = '0'.$checksum; + } return $countryCode . $checksum . $result; } diff --git a/src/Faker/Provider/Text.php b/src/Faker/Provider/Text.php index 164566f1..8186dc0e 100644 --- a/src/Faker/Provider/Text.php +++ b/src/Faker/Provider/Text.php @@ -53,7 +53,9 @@ abstract class Text extends \Faker\Provider\Base $next = implode(' ', $currentWords); // ensure text starts with an uppercase letter - if ($resultLength == 0 && !preg_match('/^\p{Lu}/u', $word)) continue; + if ($resultLength == 0 && !preg_match('/^\p{Lu}/u', $word)) { + continue; + } // append the element $result[] = $word; diff --git a/src/Faker/Provider/Uuid.php b/src/Faker/Provider/Uuid.php index eb6cf7b4..7240dfc5 100644 --- a/src/Faker/Provider/Uuid.php +++ b/src/Faker/Provider/Uuid.php @@ -39,8 +39,17 @@ class Uuid extends \Faker\Provider\Base // cast to string $uuid = sprintf( '%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x', - $tLo, $tMi, $tHi, $csHi, $csLo, - $byte[10], $byte[11], $byte[12], $byte[13], $byte[14], $byte[15] + $tLo, + $tMi, + $tHi, + $csHi, + $csLo, + $byte[10], + $byte[11], + $byte[12], + $byte[13], + $byte[14], + $byte[15] ); return $uuid; diff --git a/src/Faker/Provider/bn_BD/Address.php b/src/Faker/Provider/bn_BD/Address.php index b758995f..d692b845 100644 --- a/src/Faker/Provider/bn_BD/Address.php +++ b/src/Faker/Provider/bn_BD/Address.php @@ -2,8 +2,6 @@ namespace Faker\Provider\bn_BD; -use Faker\Provider\bn_BD\Utils; - class Address extends \Faker\Provider\Address { protected static $cityPrefix = array('দক্ষিন', 'পূর্ব', 'পশ্চিম', 'উত্তর', 'নতুন', 'লেইক', 'পোর্ট'); @@ -57,5 +55,4 @@ class Address extends \Faker\Provider\Address { return static::randomElement(static::$streetNames); } - } diff --git a/src/Faker/Provider/bn_BD/Company.php b/src/Faker/Provider/bn_BD/Company.php index 43cdc1d5..57534e1d 100644 --- a/src/Faker/Provider/bn_BD/Company.php +++ b/src/Faker/Provider/bn_BD/Company.php @@ -25,5 +25,4 @@ class Company extends \Faker\Provider\Company { return static::randomElement(static::$names); } - } diff --git a/src/Faker/Provider/bn_BD/Person.php b/src/Faker/Provider/bn_BD/Person.php index a9e70cfa..914a147b 100644 --- a/src/Faker/Provider/bn_BD/Person.php +++ b/src/Faker/Provider/bn_BD/Person.php @@ -32,5 +32,4 @@ class Person extends \Faker\Provider\Person { return static::randomElement(static::$prefix); } - } diff --git a/src/Faker/Provider/bn_BD/PhoneNumber.php b/src/Faker/Provider/bn_BD/PhoneNumber.php index 1f412647..9410ef12 100644 --- a/src/Faker/Provider/bn_BD/PhoneNumber.php +++ b/src/Faker/Provider/bn_BD/PhoneNumber.php @@ -2,8 +2,6 @@ namespace Faker\Provider\bn_BD; -use Faker\Provider\bn_BD\Utils; - class PhoneNumber extends \Faker\Provider\PhoneNumber { public static function phoneNumber() @@ -13,5 +11,4 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber return Utils::getBanglaNumber($number); } - } diff --git a/src/Faker/Provider/el_GR/Person.php b/src/Faker/Provider/el_GR/Person.php index 08d7c6c9..48962384 100644 --- a/src/Faker/Provider/el_GR/Person.php +++ b/src/Faker/Provider/el_GR/Person.php @@ -184,5 +184,4 @@ class Person extends \Faker\Provider\Person { return static::randomElement(static::$lastNameFemale); } - } diff --git a/src/Faker/Provider/en_AU/Address.php b/src/Faker/Provider/en_AU/Address.php index 39d4d4dd..ae6c9823 100644 --- a/src/Faker/Provider/en_AU/Address.php +++ b/src/Faker/Provider/en_AU/Address.php @@ -54,5 +54,4 @@ class Address extends \Faker\Provider\en_US\Address { return static::toUpper(static::randomElement(static::$buildingLetters)); } - } diff --git a/src/Faker/Provider/en_AU/PhoneNumber.php b/src/Faker/Provider/en_AU/PhoneNumber.php index c8a780d7..abf697c2 100644 --- a/src/Faker/Provider/en_AU/PhoneNumber.php +++ b/src/Faker/Provider/en_AU/PhoneNumber.php @@ -60,5 +60,4 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber { return static::numerify(static::randomElement(static::$areacodes)); } - } diff --git a/src/Faker/Provider/en_ZA/Person.php b/src/Faker/Provider/en_ZA/Person.php index 4075d6fd..314fd176 100644 --- a/src/Faker/Provider/en_ZA/Person.php +++ b/src/Faker/Provider/en_ZA/Person.php @@ -30,5 +30,4 @@ class Person extends \Faker\Provider\Person { return static::randomElement(static::$prefix); } - } diff --git a/src/Faker/Provider/fr_FR/Company.php b/src/Faker/Provider/fr_FR/Company.php index 4e61e90a..f3460747 100644 --- a/src/Faker/Provider/fr_FR/Company.php +++ b/src/Faker/Provider/fr_FR/Company.php @@ -124,7 +124,9 @@ class Company extends \Faker\Provider\Company $isEven = $position++ % 2 === 0; $tmp = $isEven ? $sequentialDigit * 2 : $sequentialDigit; - if ($tmp >= 10) $tmp -= 9; + if ($tmp >= 10) { + $tmp -= 9; + } $sum += $tmp; $siret = $sequentialDigit . $siret; @@ -140,7 +142,9 @@ class Company extends \Faker\Provider\Company $isEven = $position++ % 2 === 0; $tmp = $isEven ? $digit * 2 : $digit; - if ($tmp >= 10) $tmp -= 9; + if ($tmp >= 10) { + $tmp -= 9; + } $sum += $tmp; $siret = $digit . $siret; diff --git a/src/Faker/Provider/ja_JP/Person.php b/src/Faker/Provider/ja_JP/Person.php index d3e9a2ee..74d20608 100644 --- a/src/Faker/Provider/ja_JP/Person.php +++ b/src/Faker/Provider/ja_JP/Person.php @@ -81,5 +81,4 @@ class Person extends \Faker\Provider\Person { return static::randomElement(static::$lastKanaName); } - } diff --git a/src/Faker/Provider/me_ME/Address.php b/src/Faker/Provider/me_ME/Address.php index 8f31c428..5b9caf14 100644 --- a/src/Faker/Provider/me_ME/Address.php +++ b/src/Faker/Provider/me_ME/Address.php @@ -124,5 +124,4 @@ class Address extends \Faker\Provider\Address { return number_format(mt_rand(19260000, 19270000)/1000000, 6); } - } diff --git a/src/Faker/Provider/me_ME/Company.php b/src/Faker/Provider/me_ME/Company.php index 33ddea53..1f803127 100644 --- a/src/Faker/Provider/me_ME/Company.php +++ b/src/Faker/Provider/me_ME/Company.php @@ -46,5 +46,4 @@ class Company extends \Faker\Provider\Company { return static::randomElement(static::$names); } - } diff --git a/src/Faker/Provider/pl_PL/Company.php b/src/Faker/Provider/pl_PL/Company.php index b1eac166..c35f31a0 100644 --- a/src/Faker/Provider/pl_PL/Company.php +++ b/src/Faker/Provider/pl_PL/Company.php @@ -34,7 +34,7 @@ class Company extends \Faker\Provider\Company */ public static function regon() { - $weights = Array(8, 9, 2, 3, 4, 5, 6, 7); + $weights = array(8, 9, 2, 3, 4, 5, 6, 7); $regionNumber = static::numberBetween(0, 49) * 2 + 1; $result = array((int) ($regionNumber / 10), $regionNumber % 10); for ($i = 2, $size = count($weights); $i < $size; $i++) { diff --git a/src/Faker/Provider/pl_PL/Person.php b/src/Faker/Provider/pl_PL/Person.php index 6ad1efbd..30f35fd5 100644 --- a/src/Faker/Provider/pl_PL/Person.php +++ b/src/Faker/Provider/pl_PL/Person.php @@ -90,7 +90,7 @@ class Person extends \Faker\Provider\Person $checksum = (10 - ($checksum % 10)) % 10; $result[] = $checksum; - return implode('',$result); + return implode('', $result); } /** @@ -113,7 +113,7 @@ class Person extends \Faker\Provider\Person } $checksum %= 10; - return implode('',$low).$checksum.implode('',$high); + return implode('', $low).$checksum.implode('', $high); } /** diff --git a/src/Faker/Provider/pt_BR/Internet.php b/src/Faker/Provider/pt_BR/Internet.php index 5fd85cd9..3191aa7f 100644 --- a/src/Faker/Provider/pt_BR/Internet.php +++ b/src/Faker/Provider/pt_BR/Internet.php @@ -15,8 +15,11 @@ class Internet extends \Faker\Provider\Internet */ private static function toAscii($string) { - return preg_replace('/&([a-z]{1,2})(?:acute|cedil|circ|grave|lig|orn|ring|slash|th|tilde|uml|caron);/i', '$1', - htmlentities($string, ENT_QUOTES, 'UTF-8')); + return preg_replace( + '/&([a-z]{1,2})(?:acute|cedil|circ|grave|lig|orn|ring|slash|th|tilde|uml|caron);/i', + '$1', + htmlentities($string, ENT_QUOTES, 'UTF-8') + ); } /** diff --git a/src/Faker/Provider/tr_TR/Address.php b/src/Faker/Provider/tr_TR/Address.php index dc80133b..29d984c2 100644 --- a/src/Faker/Provider/tr_TR/Address.php +++ b/src/Faker/Provider/tr_TR/Address.php @@ -89,5 +89,4 @@ class Address extends \Faker\Provider\Address { return static::randomElement(static::$cityNames); } - } diff --git a/src/Faker/Provider/zh_CN/Company.php b/src/Faker/Provider/zh_CN/Company.php index 8871ff12..4a5a738c 100644 --- a/src/Faker/Provider/zh_CN/Company.php +++ b/src/Faker/Provider/zh_CN/Company.php @@ -23,5 +23,4 @@ class Company extends \Faker\Provider\Company { return parent::companySuffix() . '有限公司'; } - } diff --git a/src/autoload.php b/src/autoload.php index 32d5a2d3..69324ba3 100644 --- a/src/autoload.php +++ b/src/autoload.php @@ -7,7 +7,7 @@ * Code inspired from the SplClassLoader RFC * @see https://wiki.php.net/rfc/splclassloader#example_implementation */ -spl_autoload_register(function($className) { +spl_autoload_register(function ($className) { $className = ltrim($className, '\\'); $fileName = ''; $namespace = ''; From f4fc697af82db41d061178535bfee41d73fed8bf Mon Sep 17 00:00:00 2001 From: David Stensland Date: Mon, 10 Mar 2014 15:38:45 -0400 Subject: [PATCH 4/4] Allow more recent versions of PHPUnit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ad94d4d8..a26c2d90 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "4.0.*", + "phpunit/phpunit": "~4.0", "squizlabs/php_codesniffer": "~1.5" }, "autoload": {