Merge branch '3.3'

Signed-off-by: crynobone <crynobone@gmail.com>

.php_cs

@@ -33,16 +33,20 @@ return Symfony\CS\Config\Config::create()
         'phpdoc_no_access',
         '-phpdoc_no_empty_return',
         'phpdoc_no_package',
+        'phpdoc_order',
         '-phpdoc_params',
         'phpdoc_scalar',
         'phpdoc_separation',
         'phpdoc_short_description',
         'phpdoc_to_comment',
         'phpdoc_trim',
         'phpdoc_type_to_var',
+        'phpdoc_types',
         'phpdoc_var_without_name',
+        'print_to_echo',
         'remove_leading_slash_use',
         'remove_lines_between_uses',
+        'self_accessor',
         'short_array_syntax',
         'single_array_no_trailing_comma',
         'single_blank_line_before_namespace',

.travis.yml

@@ -5,7 +5,7 @@ sudo: false
 php:
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
 
 env:
   global:

composer.json

@@ -23,19 +23,20 @@
         "orchestra/support-facades": "~3.4.0"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9.4",
-        "illuminate/filesystem": "~5.4.0"
+        "illuminate/filesystem": "~5.4.0",
+        "mockery/mockery": "^0.9.4"
     },
     "suggest": {
-        "laravel/framework": "Allow using orchestra/asset component outside of Orchestra Platform (~5.4).",
-        "orchestra/html": "Allow using orchestra/asset with HTML component (~3.4).",
-        "orchestra/foundation": "Allow using orchestra/asset with Orchestra Platform (~3.4).",
-        "illuminate/filesystem": "Allow using orchestra/asset component outside of Laravel app (~5.4)."
+        "illuminate/filesystem": "Allow using orchestra/asset component outside of Laravel app (~5.4).",
+        "orchestra/html": "Allow using orchestra/asset with HTML component (~3.4)."
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.4-dev"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
     "minimum-stability": "dev"
 }

src/DependencyResolver.php

@@ -96,9 +96,9 @@ protected function evaluateAssetWithDependencies($asset, $original, &$sorted, &$
      * @param  array   $original
      * @param  array   $assets
      *
-     * @return bool
-     *
      * @throws \RuntimeException
+     *
+     * @return bool
      */
     protected function dependencyIsValid($asset, $dependency, $original, $assets)
     {