Add Laravel 5.1 support and drop PHP 5.4 support

vinkla · May 8, 2015 · fe06f5e · fe06f5e
1 parent 070ea73
commit fe06f5e
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 5.4
+  - 5.5.9
   - 5.5
   - 5.6
   - 7.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,18 @@
+# CHANGELOG
+
+## 2.1.0 (released 2015-05-08)
+
+- Support both Laravel 5.0 and 5.1
+- Dropped PHP 5.4 support
+
+## 2.0.0 (released 2015-02-03)
+
+- Laravel 5.0 release
+
+## 1.0.1 (released 2015-01-11)
+
+- Fix bug in `__construct` method
+
+## 1.0.0 (released 2014-11-27)
+
+- First stable release with Larvel 4 support
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,5 +1,4 @@
-CONTRIBUTING
-============
+# CONTRIBUTING
 
 Contributions are welcome, and are accepted via pull requests. Please review these guidelines before submitting any pull requests.
 

diff --git a/composer.json b/composer.json
@@ -10,14 +10,14 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4.7",
-		"illuminate/contracts": "5.0.*",
-		"illuminate/support": "5.0.*",
-		"graham-campbell/manager": "~2.0",
+		"php": ">=5.5.9",
+		"illuminate/contracts": "5.0.*|5.1.*",
+		"illuminate/support": "5.0.*|5.1.*",
+		"graham-campbell/manager": "~2.1",
 		"cosenary/instagram": "~2.0"
 	},
 	"require-dev": {
-		"graham-campbell/testbench": "~2.0"
+		"graham-campbell/testbench": "~2.1"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/config/instagram.php b/config/instagram.php
@@ -40,15 +40,15 @@
         'main' => [
             'client_id' => 'your-client-id',
             'client_secret' => null,
-            'callback_url' => null
+            'callback_url' => null,
         ],
 
         'alternative' => [
             'client_id' => 'your-client-id',
             'client_secret' => null,
-            'callback_url' => null
+            'callback_url' => null,
         ],
 
-    ]
+    ],
 
 ];
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -22,9 +22,6 @@
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>
-            <exclude>
-                <directory>./src/config</directory>
-            </exclude>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/src/Factories/InstagramFactory.php b/src/Factories/InstagramFactory.php
@@ -65,7 +65,7 @@ protected function getClient(array $auth)
             return new Instagram([
                 'apiKey' => $auth['client_id'],
                 'apiSecret' => $auth['client_secret'],
-                'apiCallback' => $auth['callback_url']
+                'apiCallback' => $auth['callback_url'],
             ]);
         }
 

diff --git a/src/InstagramServiceProvider.php b/src/InstagramServiceProvider.php
@@ -100,7 +100,7 @@ public function provides()
     {
         return [
             'instagram',
-            'instagram.factory'
+            'instagram.factory',
         ];
     }
 }
diff --git a/tests/Factories/InstagramFactoryTest.php b/tests/Factories/InstagramFactoryTest.php
@@ -28,7 +28,7 @@ public function testMakeStandard()
         $return = $factory->make([
             'client_id' => 'your-client-id',
             'client_secret' => null,
-            'callback_url' => null
+            'callback_url' => null,
         ]);
 
         $this->assertInstanceOf('MetzWeb\Instagram\Instagram', $return);
@@ -43,7 +43,7 @@ public function testMakeWithoutClientId()
 
         $factory->make([
             'client_secret' => null,
-            'callback_url' => null
+            'callback_url' => null,
         ]);
     }
-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     language: php
     php:
-      - 5.4
+      - 5.5.9
       - 5.5
       - 5.6
       - 7.0
@@ Expand Down @@