Bump to L5.5 minimum

Author: arrilot

.travis.yml

@@ -1,10 +1,9 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 cache:
   directories:

composer.json

@@ -9,18 +9,18 @@
             "email": "nekrasov.ilya90@gmail.com"
         }
     ],
-    "homepage": "https://github.com/Arrilot/laravel-widgets",
+    "homepage": "https://github.com/arrilot/laravel-widgets",
     "require": {
-        "php": ">=5.5.9",
-        "illuminate/support": ">=5.1",
-        "illuminate/contracts": ">=5.1",
-        "illuminate/view": ">=5.1",
-        "illuminate/container": ">=5.1",
-        "illuminate/console": ">=5.1",
-        "illuminate/cache": ">=5.1"
+        "php": ">=7.0",
+        "illuminate/support": ">=5.5",
+        "illuminate/contracts": ">=5.5",
+        "illuminate/view": ">=5.5",
+        "illuminate/container": ">=5.5",
+        "illuminate/console": ">=5.5",
+        "illuminate/cache": ">=5.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "psr-4": {

src/Misc/LaravelApplicationWrapper.php

@@ -88,8 +88,6 @@ public function getNamespace()
      */
     public function make($abstract, array $parameters = [])
     {
-        return method_exists($app, 'makeWith')
-            ? $app->makeWith($abstract, $parameters)
-            : $app->make($abstract, $parameters);
+        return $this->app->make($abstract, $parameters);
     }
 }

src/ServiceProvider.php

@@ -67,24 +67,16 @@ public function boot()
             });
         }
 
-        $omitParenthesis = version_compare($this->app->version(), '5.3', '<');
-
-        Blade::directive('widget', function ($expression) use ($omitParenthesis) {
-            $expression = $omitParenthesis ? $expression : "($expression)";
-
-            return "<?php echo app('arrilot.widget')->run{$expression}; ?>";
+        Blade::directive('widget', function ($expression) {
+            return "<?php echo app('arrilot.widget')->run($expression); ?>";
         });
 
-        Blade::directive('asyncWidget', function ($expression) use ($omitParenthesis) {
-            $expression = $omitParenthesis ? $expression : "($expression)";
-
-            return "<?php echo app('arrilot.async-widget')->run{$expression}; ?>";
+        Blade::directive('asyncWidget', function ($expression) {
+            return "<?php echo app('arrilot.async-widget')->run($expression); ?>";
         });
 
-        Blade::directive('widgetGroup', function ($expression) use ($omitParenthesis) {
-            $expression = $omitParenthesis ? $expression : "($expression)";
-
-            return "<?php echo app('arrilot.widget-group-collection')->group{$expression}->display(); ?>";
+        Blade::directive('widgetGroup', function ($expression) {
+            return "<?php echo app('arrilot.widget-group-collection')->group($expression)->display(); ?>";
         });
     }
 

tests/Support/TestApplicationWrapper.php

@@ -101,13 +101,8 @@ public function make($abstract, array $parameters = [])
 
         if (is_subclass_of($abstract, AbstractWidget::class)) {
             $app = Container::getInstance();
-            if (!$app) {
-                $app = Container::setInstance(new Container());
-            }
 
-            return method_exists($app, 'makeWith')
-                ? $app->makeWith($abstract, $parameters)
-                : $app->make($abstract, $parameters);
+            return $app->make($abstract, $parameters);
         }
 
         throw new InvalidArgumentException("Binding {$abstract} cannot be resolved while testing");

tests/Support/TestCase.php

@@ -3,9 +3,9 @@
 namespace Arrilot\Widgets\Test\Support;
 
 use Arrilot\Widgets\WidgetId;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase as BaseTestCase;
 
-class TestCase extends PHPUnit_Framework_TestCase
+class TestCase extends BaseTestCase
 {
     public function tearDown()
     {

tests/WidgetFactoryTest.php

@@ -21,7 +21,7 @@ public function setUp()
 
     public function testItThrowsExceptionForBadWidgetClass()
     {
-        $this->setExpectedException('\Arrilot\Widgets\Misc\InvalidWidgetClassException');
+        $this->expectException('\Arrilot\Widgets\Misc\InvalidWidgetClassException');
 
         $this->factory->run('testBadSlider');
     }