Merge pull request #5 from ARCANEDEV/develop

Combine the Laravel 5.1 & 5.2 support

.scrutinizer.yml

@@ -22,7 +22,7 @@ checks:
 tools:
     external_code_coverage:
         timeout: 600
-        runs: 4
+        runs: 8
     php_code_sniffer:
         enabled: true
         config:

.travis.yml

@@ -1,17 +1,21 @@
 language: php
 
+sudo: false
+
 php:
   - 5.5.9
   - 5.5
   - 5.6
   - 7.0
   - hhvm
 
-sudo: false
+env:
+  - TESTBENCH_VERSION=3.1.*
+  - TESTBENCH_VERSION=3.2.*
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer install --prefer-source --no-interaction
+  - travis_retry composer require --prefer-source --no-interaction --dev "orchestra/testbench:${TESTBENCH_VERSION}"
 
 script:
   - composer validate

composer.json

@@ -7,19 +7,17 @@
         {
             "name":     "ARCANEDEV",
             "email":    "[email protected]",
-            "homepage": "https://github.com/ARCANEDEV"
+            "homepage": "https://github.com/arcanedev-maroc",
+            "role":     "Developer"
         }
     ],
     "type":    "library",
     "license": "MIT",
     "require": {
         "php":                 ">=5.5.9",
-        "arcanedev/support":   "~3.0",
-        "illuminate/routing":  "~5.2.0",
-        "illuminate/session":  "~5.2.0"
+        "arcanedev/support":   "~3.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.2.0",
         "phpunit/phpcov":      "~2.0",
         "phpunit/phpunit":     "~4.0|~5.0"
     },
@@ -34,6 +32,9 @@
             "Arcanedev\\LaravelHtml\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "testbench": "composer require --dev \"orchestra/testbench=~3.0\""
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "5.3-dev"

src/Bases/Builder.php

@@ -0,0 +1,66 @@
+<?php namespace Arcanedev\LaravelHtml\Bases;
+
+use Arcanedev\LaravelHtml\Traits\Componentable;
+use BadMethodCallException;
+use Illuminate\Support\HtmlString;
+use Illuminate\Support\Traits\Macroable;
+
+/**
+ * Class     Builder
+ *
+ * @package  Arcanedev\LaravelHtml\Bases
+ * @author   ARCANEDEV <[email protected]>
+ */
+abstract class Builder
+{
+    /* ------------------------------------------------------------------------------------------------
+     |  Traits
+     | ------------------------------------------------------------------------------------------------
+     */
+    use Macroable, Componentable {
+        Macroable::__call     as macroCall;
+        Componentable::__call as componentCall;
+    }
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Main Functions
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Dynamically handle calls to the class.
+     *
+     * @param  string  $method
+     * @param  array   $parameters
+     *
+     * @return \Illuminate\Contracts\View\View|mixed
+     *
+     * @throws \BadMethodCallException
+     */
+    public function __call($method, $parameters)
+    {
+        try {
+            return $this->componentCall($method, $parameters);
+        }
+        catch (BadMethodCallException $e) {
+            // Continue
+        }
+
+        return $this->macroCall($method, $parameters);
+    }
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Other Functions
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Transform the string to an Html serializable object
+     *
+     * @param  string  $html
+     *
+     * @return \Illuminate\Support\HtmlString
+     */
+    protected function toHtmlString($html)
+    {
+        return new HtmlString($html);
+    }
+}