Merge pull request #1 from samcrosoft/develop

Develop
samcrosoft · Jan 26, 2017 · 277686f · 277686f
2 parents c5b49c7 + 94fb276
commit 277686f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -1,21 +1,21 @@
 {
   "name": "samcrosoft/cloudinary",
-  "description": "description here",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Laravel Based Cloudinary PHP SDK",
   "keywords": [
     "laravel",
+    "laravel5",
     "cloudinary",
     "image manipulation",
     "cloud",
     "image management"
   ],
   "type": "library",
-  "homepage": "https://github.com/samcrooft/cloudinary",
+  "homepage": "https://github.com/samcrosoft/Laravel5-Cloudinary",
   "require": {
     "php": ">=5.4.0",
-    "illuminate/support": "~5.0",
-    "cloudinary/cloudinary_php": "~1.0"
+    "illuminate/support": "^5.2",
+    "cloudinary/cloudinary_php": "^1.4.0"
   },
   "license": "MIT",
   "authors": [
@@ -25,8 +25,8 @@
     }
   ],
   "autoload": {
-    "psr-0": {
-      "Samcrosoft\\Cloudinary": "src/"
+    "psr-4": {
+      "Samcrosoft\\Cloudinary\\": "src/app/"
     }
   },
   "minimum-stability": "stable"

diff --git a/...t/Cloudinary/Facades/CloudinaryFacade.php → src/app/Facade/CloudinaryFacade.php b/...t/Cloudinary/Facades/CloudinaryFacade.php → src/app/Facade/CloudinaryFacade.php
diff --git a/...ry/Provider/CloudinaryServiceProvider.php → ...pp/Provider/CloudinaryServiceProvider.php b/...ry/Provider/CloudinaryServiceProvider.php → ...pp/Provider/CloudinaryServiceProvider.php
@@ -44,7 +44,7 @@ public function register()
     public function boot()
     {
         $this->publishes([
-            __DIR__ . '/../../../config/cloudinary.php' => config_path('cloudinary.php')
+            __DIR__ . '/../../config/cloudinary.php' => config_path('cloudinary.php')
         ]);
     }
 

diff --git a/.../Cloudinary/Wrapper/CloudinaryWrapper.php → src/app/Wrapper/CloudinaryWrapper.php b/.../Cloudinary/Wrapper/CloudinaryWrapper.php → src/app/Wrapper/CloudinaryWrapper.php
diff --git a/src/config/cloudinary.php b/src/config/cloudinary.php
@@ -19,12 +19,12 @@
     |
     */
 
-    'cloudName'  => '',
+    'cloudName'  => env('CLOUDINARY_CLOUD_NAME', ''),
     'baseUrl'    => '',
     'secureUrl'  => '',
     'apiBaseUrl' => '',
-    'apiKey'     => '',
-    'apiSecret'  => '',
+    'apiKey'     => env('CLOUDINARY_API_KEY', ''),
+    'apiSecret'  => env('CLOUDINARY_API_SECRET', ''),
 
     /*
     |--------------------------------------------------------------------------