Merge branch '2.0'

DarkaOnLine · Sep 28, 2015 · b2a67c3 · b2a67c3
2 parents 71cbd23 + ce2eb7c
commit b2a67c3
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 L5 Swagger
 ==========
 
-Swagger 2.0 for Laravel 5
+Swagger 2.0 for Laravel 5.1
 
 This package is a copy of [Swaggervel](https://github.com/slampenny/Swaggervel) adapted to work with Laravel 5 with several tweaks.
 

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
   ],
   "require": {
     "php": ">=5.4.0",
-    "zircote/swagger-php": "2.*@dev"
+    "zircote/swagger-php": "~2.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
@@ -7,26 +7,27 @@
 <html>
 <head>
     <title>Swagger UI</title>
-    <link href='/vendor/l5-swagger/css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
-    <link href='/vendor/l5-swagger/css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
-    <link href='/vendor/l5-swagger/css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
-    <link href='/vendor/l5-swagger/css/reset.css' media='print' rel='stylesheet' type='text/css'/>
-    <link href='/vendor/l5-swagger/css/screen.css' media='print' rel='stylesheet' type='text/css'/>
-    <script type="text/javascript" src="/vendor/l5-swagger/lib/shred.bundle.js"></script>
-    <script src='/vendor/l5-swagger/lib/jquery-1.8.0.min.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/lib/jquery.slideto.min.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/lib/jquery.wiggle.min.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/lib/handlebars-2.0.0.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/lib/underscore-min.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/lib/backbone-min.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/lib/swagger-client.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/swagger-ui.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/lib/highlight.7.3.pack.js' type='text/javascript'></script>
-    <script src='/vendor/l5-swagger/lib/marked.js' type='text/javascript'></script>
+    <link href={{URL::asset('/vendor/l5-swagger/css/typography.css')}} media='screen' rel='stylesheet'
+          type='text/css'/>
+    <link href={{URL::asset('/vendor/l5-swagger/css/reset.css')}} media='screen' rel='stylesheet' type='text/css'/>
+    <link href={{URL::asset('/vendor/l5-swagger/css/screen.css')}} media='screen' rel='stylesheet' type='text/css'/>
+    <link href={{URL::asset('/vendor/l5-swagger/css/reset.css')}} media='print' rel='stylesheet' type='text/css'/>
+    <link href={{URL::asset('/vendor/l5-swagger/css/screen.css')}} media='print' rel='stylesheet' type='text/css'/>
+    <script type="text/javascript" src={{URL::asset("/vendor/l5-swagger/lib/shred.bundle.js")}}></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/jquery-1.8.0.min.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/jquery.slideto.min.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/jquery.wiggle.min.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/jquery.ba-bbq.min.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/handlebars-2.0.0.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/underscore-min.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/backbone-min.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/swagger-client.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/swagger-ui.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/highlight.7.3.pack.js')}} type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/marked.js')}} type='text/javascript'></script>
 
     <!-- enabling this will enable oauth2 implicit scope support -->
-    <script src='/vendor/l5-swagger/lib/swagger-oauth.js' type='text/javascript'></script>
+    <script src={{URL::asset('/vendor/l5-swagger/lib/swagger-oauth.js')}} type='text/javascript'></script>
     <script type="text/javascript">
         $(function () {
             var url = window.location.search.match(/url=([^&]+)/);

diff --git a/src/Console/PublishAssetsCommand.php b/src/Console/PublishAssetsCommand.php
@@ -29,7 +29,7 @@ public function fire()
         $this->info("Publishing assets files");
         $this->call('vendor:publish', array(
             '--provider' => 'Darkaonline\L5Swagger\L5SwaggerServiceProvider',
-            '--tag' => 'assets'
+            '--tag' => ['assets']
         ));
     }
 

diff --git a/src/Console/PublishConfigCommand.php b/src/Console/PublishConfigCommand.php
@@ -29,7 +29,7 @@ public function fire()
         $this->info("Publish config files");
         $this->call('vendor:publish', array(
             '--provider' => 'Darkaonline\L5Swagger\L5SwaggerServiceProvider',
-            '--tag' => 'config'
+            '--tag' => ['config']
         ));
     }
 

diff --git a/src/Console/PublishViewsCommand.php b/src/Console/PublishViewsCommand.php
@@ -29,7 +29,7 @@ public function fire()
         $this->info("Publishing view files");
         $this->call('vendor:publish', array(
             '--provider' => 'Darkaonline\L5Swagger\L5SwaggerServiceProvider',
-            '--tag' => 'views'
+            '--tag' => ['views']
         ));
     }