Bugfix

composer.json

@@ -16,7 +16,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Instagram\\": "src/Instagram/"
+            "Jstolpe\\InstagramGraphApiPhpSdk\\": "src/Instagram/"
         }
     }
 }

src/Instagram/AccessToken/AccessToken.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\AccessToken;
+namespace Jstolpe\InstagramGraphApiPhpSdk\AccessToken;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\GrantTypes;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\GrantTypes;
 
 /**
  * AccessToken
@@ -247,6 +247,4 @@ public function setDataFromResponse( $response ) {
             $this->expiresAt = isset( $response['expires_in'] ) ? time() + $response['expires_in'] : 0;
         }
     }
-}
-
-?>
+}

src/Instagram/Comment/Comment.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Comment;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Comment;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Comment
@@ -142,5 +142,3 @@ public function remove() {
         return $response;
     }
 }
-
-?>

src/Instagram/Comment/Replies.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Comment;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Comment;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Replies
@@ -99,5 +99,3 @@ public function getSelf( $params = array() ) {
         return $response;
     }
 }
-
-?>

src/Instagram/Container/Container.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Container;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Container;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Container
@@ -89,5 +89,3 @@ public function getSelf( $params = array() ) {
         return $response;
     }
 }
-
-?>

src/Instagram/FacebookLogin/FacebookLogin.php

@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\FacebookLogin;
+namespace Jstolpe\InstagramGraphApiPhpSdk\FacebookLogin;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Request;
-use Instagram\Request\Params;
-use Instagram\Request\ResponseTypes;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Request;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\ResponseTypes;
 
 /**
  * FacebookLogin
@@ -80,7 +80,7 @@ public function __construct( $config = array() ) {
      * @param string $redirectUri uri the user gets sent to after logging in with facebook.
      * @param array $permissions array of the permissions you want to request from the user.
      * @param string $state this gets passed back from facebook in the redirect uri.
-     * @return Instagram response.
+     * @return string Instagram response.
      */
     public function getLoginDialogUrl( $redirectUri, $permissions, $state = '' ) {
         $params = array( // params required to generate the login url
@@ -92,8 +92,6 @@ public function getLoginDialogUrl( $redirectUri, $permissions, $state = '' ) {
         );
 
         // return the login dialog url
-        return Request::BASE_AUTHORIZATION_URL . '/' . $this->graphVersion . '/' . self::ENDPOINT . '?' . http_build_query( $params );;
+        return Request::BASE_AUTHORIZATION_URL . '/' . $this->graphVersion . '/' . self::ENDPOINT . '?' . http_build_query( $params );
     }    
-}
-
-?>
+}

src/Instagram/Hashtag/Hashtag.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Hashtag;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Hashtag;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Hashtag.
@@ -88,5 +88,3 @@ public function getSelf( $params = array() ) {
         return $response;
     }
 }
-
-?>

src/Instagram/Hashtag/RecentMedia.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Hashtag;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Hashtag;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Recent Media
@@ -109,6 +109,4 @@ public function getParams( $params = array() ) {
             return $params;
         }
     }
-}
-
-?>
+}

src/Instagram/Hashtag/TopMedia.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Hashtag;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Hashtag;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Top Media
@@ -109,6 +109,4 @@ public function getParams( $params = array() ) {
             return $params;
         }
     }
-}
-
-?>
+}

src/Instagram/HashtagSearch/HashtagSearch.php

@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\HashtagSearch;
+namespace Jstolpe\InstagramGraphApiPhpSdk\HashtagSearch;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
 
 /**
  * Hashtag Search.
@@ -86,6 +86,4 @@ public function getSelf( $hashtagName ) {
         // return response
         return $response;
     }
-}
-
-?>
+}

src/Instagram/Instagram.php

@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram;
+namespace Jstolpe\InstagramGraphApiPhpSdk;
 
 // other classes to use
-use Instagram\Request\Request;
-use Instagram\Request\Curl;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Request;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Curl;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Instagram
@@ -246,6 +246,4 @@ public function calcLinkFromCursor( $type, &$response, $endpoint, $params ) {
             $response[Fields::PAGING][$pagingOrder] = $request->getUrl();
         }
     }
-}
-
-?>
+}

src/Instagram/Media/Children.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Media;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Media;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Children
@@ -76,6 +76,4 @@ public function getSelf( $params = array() ) {
         // return response
         return $response;
     }
-}
-
-?>
+}

src/Instagram/Media/Comments.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Media;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Media;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Comments
@@ -120,6 +120,4 @@ public function getParams( $params = array() ) {
             return $params;
         }
     }
-}
-
-?>
+}

src/Instagram/Media/Insights.php

@@ -21,13 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Media;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Media;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
-use Instagram\Request\Metric;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Metric;
 
 /**
  * Insights
@@ -137,5 +136,3 @@ public function getParams( $params = array() ) {
         }
     } 
 }
-
-?>

src/Instagram/Media/Media.php

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-namespace Instagram\Media;
+namespace Jstolpe\InstagramGraphApiPhpSdk\Media;
 
 // other classes we need to use
-use Instagram\Instagram;
-use Instagram\Request\Params;
-use Instagram\Request\Fields;
+use Jstolpe\InstagramGraphApiPhpSdk\Instagram;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Params;
+use Jstolpe\InstagramGraphApiPhpSdk\Request\Fields;
 
 /**
  * Media
@@ -118,6 +118,4 @@ public function getParams( $params = array() ) {
             return $params;
         }
     }
-}
-
-?>
+}