From 2a8258728b8dd710b8807e63a26307505c2a9442 Mon Sep 17 00:00:00 2001
From: Mark van der Velden <mark@dynom.nl>
Date: Sat, 18 May 2013 16:53:58 +0200
Subject: [PATCH 1/2] Removed all requires and added the autoload definition to
 composer.

---
 composer.json                             | 5 ++++-
 phpunit.xml.dist                          | 2 +-
 src/Faker/Provider/bg_BG/Person.php       | 2 --
 src/Faker/Provider/it_IT/Address.php      | 2 --
 src/Faker/Provider/it_IT/Company.php      | 2 --
 src/Faker/Provider/it_IT/Person.php       | 2 --
 src/Faker/Provider/it_IT/PhoneNumber.php  | 2 --
 test/Faker/Provider/fr_FR/CompanyTest.php | 4 ----
 test/documentor.php                       | 2 +-
 test/test.php                             | 2 +-
 10 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 94543706..e008c4ba 100644
--- a/composer.json
+++ b/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": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 49127f3c..75d7e830 100644
--- a/phpunit.xml.dist
+++ b/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>
diff --git a/src/Faker/Provider/bg_BG/Person.php b/src/Faker/Provider/bg_BG/Person.php
index 9901ec73..7eae7fdf 100644
--- a/src/Faker/Provider/bg_BG/Person.php
+++ b/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(
diff --git a/src/Faker/Provider/it_IT/Address.php b/src/Faker/Provider/it_IT/Address.php
index d80ac270..ebfcac06 100644
--- a/src/Faker/Provider/it_IT/Address.php
+++ b/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');
diff --git a/src/Faker/Provider/it_IT/Company.php b/src/Faker/Provider/it_IT/Company.php
index 64103034..6cc96798 100644
--- a/src/Faker/Provider/it_IT/Company.php
+++ b/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(
diff --git a/src/Faker/Provider/it_IT/Person.php b/src/Faker/Provider/it_IT/Person.php
index 5b1c27fb..97be8d6f 100644
--- a/src/Faker/Provider/it_IT/Person.php
+++ b/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(
diff --git a/src/Faker/Provider/it_IT/PhoneNumber.php b/src/Faker/Provider/it_IT/PhoneNumber.php
index ca445663..d8a772f7 100644
--- a/src/Faker/Provider/it_IT/PhoneNumber.php
+++ b/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(
diff --git a/test/Faker/Provider/fr_FR/CompanyTest.php b/test/Faker/Provider/fr_FR/CompanyTest.php
index 0b68d56f..c3e6f3d5 100644
--- a/test/Faker/Provider/fr_FR/CompanyTest.php
+++ b/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()
diff --git a/test/documentor.php b/test/documentor.php
index fb6c665b..1051ea28 100644
--- a/test/documentor.php
+++ b/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);
diff --git a/test/test.php b/test/test.php
index d65fc431..6abd040d 100644
--- a/test/test.php
+++ b/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);

From b65b77694da6fb9f5766e5684c2a05ae9049c880 Mon Sep 17 00:00:00 2001
From: Mark van der Velden <mark@dynom.nl>
Date: Sat, 18 May 2013 16:58:28 +0200
Subject: [PATCH 2/2] Adding a composer command to travis.

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4b5b1b6b..23510f6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: php
 php: 5.3
+before_script:
+  - composer install --dev
 script: phpunit