Merge pull request #19 from talyssonoc/fix_relative_path_issue

Finally fix relative path issue

Author: talyssonoc

README.md

@@ -9,7 +9,7 @@ With `react-laravel` you'll be able to use [ReactJS](https://facebook.github.io/
 You just need to add this to your `composer.json`'s `"require"`:
 
 ```json
-  "talyssonoc/react-laravel": "0.5"
+  "talyssonoc/react-laravel": "0.7"
 ```
 
 Also you got to set the `minimum-stability` of your `composer.json` to `dev`, adding this:

lib/React.php

@@ -1,5 +1,10 @@
 <?php namespace React;
 
+  // Fix PHPUnit issue with relative path for `autoload.php`
+  if(!defined('ENVIRONMENT') || ENVIRONMENT != 'test') {
+    require_once '../vendor/autoload.php';
+  }
+
   class React {
     private $react;
     private $defaultOptions;

lib/ReactServiceProvider.php

@@ -1,7 +1,5 @@
 <?php namespace React;
 
-require '../vendor/autoload.php';
-
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Blade;
@@ -25,7 +23,7 @@ public function boot() {
   public function register() {
 
     $this->app->bind('React', function() {
-      
+
       $defaultReactPath = implode(DIRECTORY_SEPARATOR,
                                   [App::publicPath(), 'vendor', 'react-laravel', 'react.js']);
 
@@ -37,7 +35,7 @@ public function register() {
 
       $reactSource = file_get_contents($reactPath);
       $componentsSource = file_get_contents($componentsPath);
-      
+
       return new React($reactSource, $componentsSource);
     });
   }

phpunit.php

@@ -4,8 +4,9 @@
 ini_set('display_errors', '1');
 ini_set('display_startup_errors', '1');
 
-// Requires the Composer's autoload
-require __DIR__ . '/vendor/autoload.php';
+define('ENVIRONMENT', 'test');
+
+require_once 'vendor/autoload.php';
 
 $GLOBALS['reactSource'] = file_get_contents(__DIR__ . '/assets/react.js');
 $GLOBALS['componentsSource'] = file_get_contents(__DIR__ . '/tests/fixtures/components.js');