Changed variable to static

Robert Wittman · Robert Wittman · commit 136f1b8c71c4 · 2016-07-07T11:35:35.000-04:00
diff --git a/examples/authentication_no_strict.php b/examples/authentication_no_strict.php
@@ -30,5 +30,6 @@
         exit();
     }
 
-    echo $accessToken; // 53e20e750c89274d02b53927135fd664
+    echo $accessToken->access_token; // 53e20e750c89274d02b53927135fd664
+    echo $accessToken->scope; // read_products
 }
diff --git a/examples/strict_authentication.php b/examples/strict_authentication.php
@@ -49,7 +49,8 @@
         exit();
     }
 
-    echo $accessToken; // 53e20e750c89274d02b53927135fd664
+    echo $accessToken->access_token; // 53e20e750c89274d02b53927135fd664
+    echo $accessToken->scope; // read_products
 }
 
 
diff --git a/lib/Auth.php b/lib/Auth.php
@@ -54,7 +54,7 @@ public static function accessToken()
         if(\Shopify\Shopify::strict())
         {
             if( is_null( self::$nonce ) ) throw new \Exception('No nonce was set. use Auth::setNonce($nonce) to set one');
-            if( !self::checkNonce( $nonce ) ) throw new \Exception("Authentication nonce failed verification");
+            if( !self::checkNonce( self::$nonce ) ) throw new \Exception("Authentication nonce failed verification");
             if( !\Shopify\Shopify::validateHmac() ) throw new Exception\ApiException("HMAC signature failed verification");
         }
         return \Shopify\AccessToken::createFromCode($_GET['code']);

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,6 @@`
`30`	`30`	`exit();`
`31`	`31`	`}`
`32`	`32`
`33`		`- echo $accessToken; // 53e20e750c89274d02b53927135fd664`
	`33`	`+ echo $accessToken->access_token; // 53e20e750c89274d02b53927135fd664`
	`34`	`+ echo $accessToken->scope; // read_products`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@`
`49`	`49`	`exit();`
`50`	`50`	`}`
`51`	`51`
`52`		`- echo $accessToken; // 53e20e750c89274d02b53927135fd664`
	`52`	`+ echo $accessToken->access_token; // 53e20e750c89274d02b53927135fd664`
	`53`	`+ echo $accessToken->scope; // read_products`
`53`	`54`	`}`
`54`	`55`
`55`	`56`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public static function accessToken()`
`54`	`54`	`if(\Shopify\Shopify::strict())`
`55`	`55`	`{`
`56`	`56`	`if( is_null( self::$nonce ) ) throw new \Exception('No nonce was set. use Auth::setNonce($nonce) to set one');`
`57`		`- if( !self::checkNonce( $nonce ) ) throw new \Exception("Authentication nonce failed verification");`
	`57`	`+ if( !self::checkNonce( self::$nonce ) ) throw new \Exception("Authentication nonce failed verification");`
`58`	`58`	`if( !\Shopify\Shopify::validateHmac() ) throw new Exception\ApiException("HMAC signature failed verification");`
`59`	`59`	`}`
`60`	`60`	`return \Shopify\AccessToken::createFromCode($_GET['code']);`