Merge pull request #133 from Dynom/changingAutoloaderToComposer

Removed all requires and added the autoload definition to composer.

.travis.yml

@@ -1,3 +1,5 @@
 language: php
 php: 5.3
+before_script:
+  - composer install --dev
 script: phpunit

composer.json

@@ -13,7 +13,10 @@
         "php": ">=5.3.3"
     },
     "autoload": {
-        "psr-0": { "Faker": "src/" }
+        "psr-0": {
+            "Faker": "src/",
+            "Faker\\PHPUnit": "test/"
+        }
     },
     "extra": {
         "branch-alias": {

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="src/autoload.php">
+<phpunit bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="Faker Test Suite">
             <directory>./test/Faker/</directory>

src/Faker/Provider/bg_BG/Person.php

@@ -2,8 +2,6 @@
 
 namespace Faker\Provider\bg_BG;
 
-require_once __DIR__ . '/../Person.php';
-
 class Person extends \Faker\Provider\Person
 {
     protected static $formats = array(

src/Faker/Provider/it_IT/Address.php

@@ -2,8 +2,6 @@
 
 namespace Faker\Provider\it_IT;
 
-require_once __DIR__ . '/../Address.php';
-
 class Address extends \Faker\Provider\Address
 {
     protected static $cityPrefix = array('San', 'Borgo', 'Sesto', 'Quarto', 'Settimo');

src/Faker/Provider/it_IT/Company.php

@@ -2,8 +2,6 @@
 
 namespace Faker\Provider\it_IT;
 
-require_once __DIR__ . '/../Company.php';
-
 class Company extends \Faker\Provider\Company
 {
     protected static $formats = array(

src/Faker/Provider/it_IT/Person.php

@@ -2,8 +2,6 @@
 
 namespace Faker\Provider\it_IT;
 
-require_once __DIR__ . '/../Person.php';
-
 class Person extends \Faker\Provider\Person
 {
     protected static $formats = array(

src/Faker/Provider/it_IT/PhoneNumber.php

@@ -2,8 +2,6 @@
 
 namespace Faker\Provider\it_IT;
 
-require_once __DIR__ . '/../PhoneNumber.php';
-
 class PhoneNumber extends \Faker\Provider\PhoneNumber
 {
     protected static $formats = array(

test/Faker/Provider/fr_FR/CompanyTest.php

@@ -5,10 +5,6 @@ namespace Faker\Test\Provider\fr_FR;
 use Faker\Provider\fr_FR\Company;
 use Faker\PHPUnit\Framework\Constraint as Constraint;
 
-require_once __DIR__ . '/../../PHPUnit/Framework/Constraint/IsValidSirenSiret.php';
-require_once __DIR__ . '/../../PHPUnit/Framework/Constraint/IsValidSiret.php';
-require_once __DIR__ . '/../../PHPUnit/Framework/Constraint/IsValidSiren.php';
-
 class CompanyTest extends \PHPUnit_Framework_TestCase
 {
     private static function isValidSiret()

test/documentor.php

@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/../src/autoload.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 $generator = Faker\Factory::create();
 $generator->seed(1);

test/test.php

@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/../src/autoload.php';
+require __DIR__ .'/../vendor/autoload.php';
 
 $faker = Faker\Factory::create();
 $faker->seed(5);