Merge pull request #342 from Rican7/bugfix/php-7-compatibility

Bugfix - PHP 7 compatibility
klein · Nov 1, 2016 · fdf072b · fdf072b
2 parents 05a5da6 + 2547866
commit fdf072b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,6 @@ php:
 
 matrix:
   allow_failures:
-    - php: 7.0
     - php: nightly
     - php: hhvm
   fast_finish: true

diff --git a/tests/Klein/Tests/Mocks/TestClass.php b/tests/Klein/Tests/Mocks/TestClass.php
@@ -14,7 +14,7 @@
 class TestClass
 {
 
-    public static function get($r, $r, $a)
+    public static function get($request, $response, $app)
     {
         echo 'ok';
     }

diff --git a/tests/Klein/Tests/RoutingTest.php b/tests/Klein/Tests/RoutingTest.php
@@ -113,20 +113,20 @@ public function testAppReference()
 
         $this->klein_app->respond(
             '/',
-            function ($r, $r, $s, $a) {
-                $a->state = 'a';
+            function ($request, $response, $service, $app) {
+                $app->state = 'a';
             }
         );
         $this->klein_app->respond(
             '/',
-            function ($r, $r, $s, $a) {
-                $a->state .= 'b';
+            function ($request, $response, $service, $app) {
+                $app->state .= 'b';
             }
         );
         $this->klein_app->respond(
             '/',
-            function ($r, $r, $s, $a) {
-                print $a->state;
+            function ($request, $response, $service, $app) {
+                print $app->state;
             }
         );