Merge pull request #5 from attozk/react_04_compatible

React 04 compatible

Author: bixuehujin

composer.json

@@ -5,11 +5,17 @@
     "license": "None",
     "require": {
         "php": ">=5.4.0",
-        "react/react": "0.3.*"
+        "react/socket": "0.4.*",
+        "react/dns": "0.4.*",
+        "react/socket-client": "0.4.*",
+        "react/promise": "~2.0"
+    },
+    "require-dev": {
+        "phpunit/dbunit": ">=1.2"
     },
     "autoload": {
-        "psr-0": {
-            "React\\MySQL": "src/"
+        "psr-4": {
+            "React\\MySQL\\": "src"
         }
     }
 }

examples/init.php

@@ -1,4 +1,9 @@
 <?php
-$loader = require __DIR__ . '/../vendor/autoload.php';
+
+$loader = @include __DIR__ . '/../vendor/autoload.php';
+if (!$loader) {
+    $loader = require __DIR__ . '/../../../../vendor/autoload.php';
+}
 $loader->add('React\MySQL', __DIR__ . '/../src/');
-return $loader;
+
+return $loader;

phpunit.xml.dist

@@ -13,7 +13,7 @@
 >
     <testsuites>
         <testsuite name="React.MySQL Test Suite">
-            <directory>./tests/React/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 
@@ -23,9 +23,9 @@
         </whitelist>
     </filter>
     <php>
-    	<var name="db_dsn" value="mysql:dbname=test;host=localhost"/>
-    	<var name="db_user" value="test" />
-    	<var name="db_passwd" value="test" />
-    	<var name="db_dbname" value="test" />
+        <var name="db_dsn" value="mysql:dbname=test;host=localhost"/>
+        <var name="db_user" value="test" />
+        <var name="db_passwd" value="test" />
+        <var name="db_dbname" value="test" />
     </php>
 </phpunit>