multidimension-al / cakephpify

tests/TestCase/Controller/Component/ShopifyDatabaseComponentTest.php

Braces +8 added lines, -16 removed lines

@@ -24,8 +24,7 @@ 
 use Cake\Network\Response;
 use Cake\TestSuite\TestCase;
 
-class ShopifyDatabaseComponentTest extends TestCase
-{
+class ShopifyDatabaseComponentTest extends TestCase {
 
     public $component = null;
     public $controller = null;
@@ -33,8 +32,7 @@ 
     public $fixtures = ['plugin.Multidimensional/Shopify.Shops',
                             'plugin.Multidimensional/Shopify.AccessTokens'];
 
-    public function setUp()
-    {
+    public function setUp() {
         parent::setUp();
         $request = new Request();
         $response = new Response();
@@ -48,34 +46,28 @@ 
         $this->component->startup($event);
     }
 
-    public function tearDown()
-    {
+    public function tearDown() {
         parent::tearDown();
         unset($this->component, $this->controller);
     }
 
-    public function testShopDataToDatabase()
-    {
+    public function testShopDataToDatabase() {
         $this->markTestIncomplete('Not implemented yet.');
     }
 
-    public function testAccessTokenToDatabase()
-    {
+    public function testAccessTokenToDatabase() {
         $this->markTestIncomplete('Not implemented yet.');
     }
 
-    public function testGetShopIdFromDomain()
-    {
+    public function testGetShopIdFromDomain() {
         $this->markTestIncomplete('Not implemented yet.');
     }
 
-    public function testGetShopDataFromAccessToken()
-    {
+    public function testGetShopDataFromAccessToken() {
         $this->markTestIncomplete('Not implemented yet.');
     }
 
-    public function testGetAccessTokenFromShopDomain()
-    {
+    public function testGetAccessTokenFromShopDomain() {
         $this->markTestIncomplete('Not implemented yet.');
     }
 }

src/Auth/ShopifyAuthAuthenticate.php

Indentation +4 added lines, -4 removed lines

@@ -40,17 +40,17 @@
 		
         if (empty($this->api_key)) {
 
-          $controller = $this->_registry->getController();
+            $controller = $this->_registry->getController();
 
-          if (isset($controller->request->api_key)) {
+            if (isset($controller->request->api_key)) {
             $this->api_key = $controller->request->api_key;
-          }
+            }
 
         }
 		
         $this->ShopifyAPI = $registry->load('Multidimensional/Shopify.ShopifyAPI', [
             'api_key' => $this->api_key
-		]);
+        ]);
 
         $this->ShopifyDatabase = $registry->load('Multidimensional/Shopify.ShopifyDatabase');
     }

Braces +10 added lines, -20 removed lines

@@ -25,15 +25,13 @@ 
 
 use Multidimensional\Shopify\Auth\Event;
 
-class ShopifyAuthAuthenticate extends BaseAuthenticate
-{
+class ShopifyAuthAuthenticate extends BaseAuthenticate {
 
     public $api_key;
     private $ShopifyAPI;
     private $ShopifyDatabase;
 
-    public function __construct($registry, array $config = [])
-    {
+    public function __construct($registry, array $config = []) {
         parent::__construct($registry, $config);
 
         $this->api_key = isset($config['api_key']) ? $config['api_key'] : '';
@@ -55,14 +53,12 @@ 
         $this->ShopifyDatabase = $registry->load('Multidimensional/Shopify.ShopifyDatabase');
     }
 
-    public function authenticate(Request $request, Response $response)
-    {
+    public function authenticate(Request $request, Response $response) {
 
         return $this->getUser($request);
     }
 
-    public function unauthenticated(Request $request, Response $response)
-    {
+    public function unauthenticated(Request $request, Response $response) {
 
         if (isset($request->query['hmac'])
             && isset($request->query['shop'])) {
@@ -84,8 +80,7 @@ 
         return $response->location($this->_generateLoginUrl());
     }
 
-    public function getUser(Request $request)
-    {
+    public function getUser(Request $request) {
 
         $accessToken = $request->session()->read('shopify_access_token_' . $this->api_key);
         $shopDomain = $request->session()->read('shopify_shop_domain_' . $this->api_key);
@@ -125,31 +120,26 @@ 
         return false;
     }
 
-    protected function _authenticate(Request $request)
-    {
+    protected function _authenticate(Request $request) {
     }
 
-    public function implementedEvents()
-    {
+    public function implementedEvents() {
         return [
             'Auth.afterIdentify' => 'afterIdentify',
             'Auth.logout' => 'logout'
         ];
     }
 
-    public function afterIdentify(Event $event, array $user)
-    {
+    public function afterIdentify(Event $event, array $user) {
     }
 
-    public function logout(Event $event, array $user)
-    {
+    public function logout(Event $event, array $user) {
 
         //$request->session()->delete('shopify_access_token_' . $this->api_key);
         //$request->session()->delete('shopify_shop_domain_' . $this->api_key);
     }
 
-    private function _generateLoginUrl()
-    {
+    private function _generateLoginUrl() {
         return Router::url(['controller' => 'Install', 'action' => 'index', 'plugin' => 'Multidimensional/Shopify']);
     }
 }

src/Shell/Helper/TableHelper.php

Braces +2 added lines, -4 removed lines

@@ -18,11 +18,9 @@
 use Cake\Console\Shell;
 use Cake\Console\Helper;
 
-class TableHelper extends Helper
-{
+class TableHelper extends Helper {
 
-    public function output($data, $columns = 10, $terminalWidth = 80)
-    {
+    public function output($data, $columns = 10, $terminalWidth = 80) {
         while ((count($data) % $columns != 0) && ($columns > 5)) {
             $columns--;
         }

src/Shell/ShopifyInstallShell.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
         $first_run = ((Configure::check('Multidimensional/Shopify')) ? false : true);
             
         //Activate Plugin           
-        if ((($first_run) ? (strtolower($this->in('Install Shopify Plugin?', ['y','n'])) == 'y') : (strtolower($this->in('Update Configuration?', ['y','n'])) == 'y'))) {
+        if ((($first_run) ? (strtolower($this->in('Install Shopify Plugin?', ['y', 'n'])) == 'y') : (strtolower($this->in('Update Configuration?', ['y', 'n'])) == 'y'))) {
             
 
             $this->out();
@@ -66,7 +66,7 @@ 
                 }
                 $scope = array_map('trim', $scope);
                 $scope = array_map('strtolower', $scope);
-                array_walk($scope, function (&$value) {
+                array_walk($scope, function(&$value) {
                     $value = str_replace(" ", "_", $value);
                 });
 
@@ -75,9 +75,9 @@ 
                     $this->_io->out('<error>Invalid Scope. Try again, or leave blank to continue.</error>');
                 }
 
-            } while((count($scope)) && (strlen(trim(implode("", $scope))) > 0) && (count(array_diff($scope, $scope_array)) > 0));
+            } while ((count($scope)) && (strlen(trim(implode("", $scope))) > 0) && (count(array_diff($scope, $scope_array)) > 0));
             
-            Configure::write('Multidimensional/Shopify.' . $api_key . '.scope',implode(',', $scope));
+            Configure::write('Multidimensional/Shopify.' . $api_key . '.scope', implode(',', $scope));
             
             $this->out('');
             $isPrivateApp = strtolower($this->in('Is this a private app?', ['y', 'n']));
@@ -89,10 +89,10 @@ 
             }
 
             
-            Configure::write('Multidimensional/Shopify.' . $api_key . '.is_private_app',$is_private_app);
+            Configure::write('Multidimensional/Shopify.' . $api_key . '.is_private_app', $is_private_app);
             
             if ($is_private_app == 'true') {
-                Configure::write('Multidimensional/Shopify.' . $api_key . '.private_app_password',$this->in('Private App Password:'));
+                Configure::write('Multidimensional/Shopify.' . $api_key . '.private_app_password', $this->in('Private App Password:'));
             } else {
                 Configure::write('Multidimensional/Shopify.' . $api_key . '.private_app_password', NULL);
             }

Braces +2 added lines, -4 removed lines

@@ -21,11 +21,9 @@
 use Cake\Console\Helper;
 use Migrations\Migrations;
 
-class ShopifyInstallShell extends Shell
-{
+class ShopifyInstallShell extends Shell {
 
-    public function main()
-    {
+    public function main() {
 
         $this->clear();
 

src/Controller/InstallController.php

Braces +4 added lines, -8 removed lines

@@ -22,13 +22,11 @@ 
 
 use Multidimensional\Shopify\Controller\AppController;
 
-class InstallController extends AppController
-{
+class InstallController extends AppController {
 
     private $error;
 
-    public function initialize()
-    {
+    public function initialize() {
 
         parent::initialize();
         $this->loadComponent('Multidimensional/Shopify.ShopifyDatabase');
@@ -96,8 +94,7 @@ 
         $this->render('index');
     }
 
-    public function index()
-    {
+    public function index() {
 
         if (!empty($this->request->query['code']) && !$this->error) {
 
@@ -135,8 +132,7 @@ 
         }
     }
 
-    public function redirect($url, $status = 302)
-    {
+    public function redirect($url, $status = 302) {
 
         $this->set('shopify_auth_url', $url);
         $this->render('redirect');

src/Controller/Component/ShopifyDatabaseComponent.php

Spacing +3 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
 
         $shopEntity = $this->shops->findByMyshopifyDomain($domain)->first();
         if ($shopEntity->id) {
-            return (int)$shopEntity->id;
+            return (int) $shopEntity->id;
         } else {
             return false;
         }
@@ -116,7 +116,7 @@ 
         $query = $this->access_tokens->find();
         $query = $query->contain(['Shops']);
         $query = $query->where(['api_key' => $apiKey, 'token' => $accessToken]);
-        $query = $query->where(function ($exp, $q) {
+        $query = $query->where(function($exp, $q) {
             return $exp->isNull('expired_at');
         });
 
@@ -135,7 +135,7 @@ 
         $query = $this->access_tokens->find();
         $query = $query->contain(['Shops']);
         $query = $query->where(['api_key' => $apiKey, 'Shops.myshopify_domain' => $shopDomain]);
-        $query = $query->where(function ($exp, $q) {
+        $query = $query->where(function($exp, $q) {
             return $exp->isNull('expired_at');
         });
 

Braces +9 added lines, -18 removed lines

@@ -19,35 +19,30 @@ 
 use Cake\ORM\TableRegistry;
 use Cake\Event\Event;
 
-class ShopifyDatabaseComponent extends Component
-{
+class ShopifyDatabaseComponent extends Component {
 
     private $shops;
     private $access_tokens;
 
     public $controller = null;
 
-    public function initialize(array $config = [])
-    {
+    public function initialize(array $config = []) {
         $this->shops = TableRegistry::get('Multidimensional/Shopify.Shops');
         $this->access_tokens = TableRegistry::get('Multidimensional/Shopify.AccessTokens');
     }
 
-    public function startup(Event $event)
-    {
+    public function startup(Event $event) {
         $this->setController($event->subject());
     }
 
-    public function setController($controller)
-    {
+    public function setController($controller) {
         $this->controller = $controller;
         if (!isset($this->controller->paginate)) {
             $this->controller->paginate = [];
         }
     }
 
-    public function shopDataToDatabase(array $data)
-    {
+    public function shopDataToDatabase(array $data) {
 
         $shopEntity = $this->shops->newEntity();
 
@@ -67,8 +62,7 @@ 
     }
 
 
-    public function accessTokenToDatabase($accessToken, $shopId, $apiKey)
-    {
+    public function accessTokenToDatabase($accessToken, $shopId, $apiKey) {
 
         $accessTokenEntity = $this->access_tokens->newEntity();
 
@@ -99,8 +93,7 @@ 
         }
     }
 
-    public function getShopIdFromDomain($domain)
-    {
+    public function getShopIdFromDomain($domain) {
 
         $shopEntity = $this->shops->findByMyshopifyDomain($domain)->first();
         if ($shopEntity->id) {
@@ -110,8 +103,7 @@ 
         }
     }
 
-    public function getShopDataFromAccessToken($accessToken, $apiKey)
-    {
+    public function getShopDataFromAccessToken($accessToken, $apiKey) {
 
         $query = $this->access_tokens->find();
         $query = $query->contain(['Shops']);
@@ -129,8 +121,7 @@ 
         }
     }
 
-    public function getAccessTokenFromShopDomain($shopDomain, $apiKey)
-    {
+    public function getAccessTokenFromShopDomain($shopDomain, $apiKey) {
 
         $query = $this->access_tokens->find();
         $query = $query->contain(['Shops']);

src/Controller/Component/ShopifyAPIComponent.php

Indentation +6 added lines, -6 removed lines

@@ -41,26 +41,26 @@
 
         parent::initialize($config);
         
-      $this->api_key = isset($config['api_key']) ? $config['api_key'] : '';
+        $this->api_key = isset($config['api_key']) ? $config['api_key'] : '';
 				
-      if (!empty($this->api_key)) {
+        if (!empty($this->api_key)) {
 
         $this->shared_secret = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.shared_secret');
         $this->scope = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.scope');
         $this->is_private_app = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.is_private_app');
         $this->private_app_password = Configure::read('Multidimensional/Shopify.' . $this->api_key . '.private_app_password');        
 
-      } else {
+        } else {
 
         throw new NotImplementedException(__('Shopify API key not found'));
 
-      }
+        }
 
-      if (!$this->shared_secret) {
+        if (!$this->shared_secret) {
 
         throw new NotImplementedException(__('Shopify shared secret not found'));
 
-      }
+        }
       
     }
 

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
     {
         $params = explode("/", $this->response->getHeaderLine('http_x_shopify_shop_api_call_limit'));
 
-        return (int)$params[$index];
+        return (int) $params[$index];
     }
 
     public function getAuthorizeUrl($shopDomain, $redirectUrl)

Braces +21 added lines, -42 removed lines

@@ -22,8 +22,7 @@ 
 use Cake\Event\Event;
 use Cake\Network\Exception\NotImplementedException;
 
-class ShopifyAPIComponent extends Component
-{
+class ShopifyAPIComponent extends Component {
   
     public $api_key;
 
@@ -36,8 +35,7 @@ 
 
     public $controller = null;
 
-    public function initialize(array $config = [])
-    {
+    public function initialize(array $config = []) {
 
         parent::initialize($config);
         
@@ -64,13 +62,11 @@ 
       
     }
 
-    public function startup(Event $event)
-    {
+    public function startup(Event $event) {
         $this->setController($event->subject());
     }
 
-    public function setController($controller)
-    {
+    public function setController($controller) {
         $this->controller = $controller;
         if (!isset($this->controller->paginate)) {
             $this->controller->paginate = [];
@@ -78,33 +74,27 @@ 
 
     }
 
-    public function setShopDomain($shopDomain)
-    {
+    public function setShopDomain($shopDomain) {
         return $this->shop_domain = $shopDomain;
     }
 
-    public function getShopDomain()
-    {
+    public function getShopDomain() {
         return $this->shop_domain;
     }
 
-    public function setAccessToken($token)
-    {
+    public function setAccessToken($token) {
         return $this->token = $token;
     }
 
-    public function callsMade()
-    {
+    public function callsMade() {
         return $this->shopApiCallLimitParam(0);
     }
 
-    public function callLimit()
-    {
+    public function callLimit() {
         return $this->shopApiCallLimitParam(1);
     }
 
-    public function callsLeft($responseHeaders)
-    {
+    public function callsLeft($responseHeaders) {
         return $this->callLimit() - $this->callsMade();
     }
 
@@ -112,8 +102,7 @@ 
      * @param string $method
      * @param string $path
      */
-    public function call($method, $path, $params = [])
-    {
+    public function call($method, $path, $params = []) {
 
         if (!$this->_isReady()) {
             return false;
@@ -143,15 +132,13 @@ 
     /**
      * @param int $index
      */
-    private function shopApiCallLimitParam($index)
-    {
+    private function shopApiCallLimitParam($index) {
         $params = explode("/", $this->response->getHeaderLine('http_x_shopify_shop_api_call_limit'));
 
         return (int)$params[$index];
     }
 
-    public function getAuthorizeUrl($shopDomain, $redirectUrl)
-    {
+    public function getAuthorizeUrl($shopDomain, $redirectUrl) {
 
         $url = 'https://' . $shopDomain . '/admin/oauth/authorize?client_id=' . $this->api_key;
         $url .= '&scope=' . urlencode($this->scope);
@@ -161,8 +148,7 @@ 
         return $url;
     }
 
-    public function getAccessToken($shopDomain, $code)
-    {
+    public function getAccessToken($shopDomain, $code) {
 
         $this->shop_domain = $shopDomain;
 
@@ -186,33 +172,28 @@ 
         }
     }
 
-    public function setNonce($shopDomain)
-    {
+    public function setNonce($shopDomain) {
 
         return $this->nonce = md5(strtolower($shopDomain));
     }
 
 
-    public function getNonce()
-    {
+    public function getNonce() {
 
         return $this->nonce;
     }
 
-    public function validDomain($shopDomain)
-    {
+    public function validDomain($shopDomain) {
 
         return true;
     }
 
-    public function getShopData()
-    {
+    public function getShopData() {
 
         return $this->call('GET', '/admin/shop.json');
     }
 
-    public function validateHMAC($query)
-    {
+    public function validateHMAC($query) {
 
         if (!is_array($query) || empty($query['hmac']) || !is_string($query['hmac']) || (isset($query['state']) && $query['state'] != $this->getNonce($query['shop']))) {
             return false;
@@ -237,8 +218,7 @@ 
     /**
      * @param string $url
      */
-    private function _urlEncode($url)
-    {
+    private function _urlEncode($url) {
 
         $url = str_replace('&', '%26', $url);
         $url = str_replace('%', '%25', $url);
@@ -246,8 +226,7 @@ 
         return $url;
     }
 
-    private function _isReady()
-    {
+    private function _isReady() {
         return strlen($this->shop_domain) > 0 && strlen($this->token) > 0;
     }
 }