Completed
Branch master (3b2ee6)
by AJ
05:37
created
src/Controller/Component/ShopifyAPIComponent.php 3 patches
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -66,6 +66,10 @@  discard block
 block discarded – undo
66 66
         return $this->callLimit() - $this->callsMade();
67 67
     }
68 68
 
69
+    /**
70
+     * @param string $method
71
+     * @param string $path
72
+     */
69 73
     public function call($method, $path, $params=array()) {
70 74
         
71 75
         if (!$this->_isReady()) {
@@ -94,6 +98,9 @@  discard block
 block discarded – undo
94 98
         
95 99
     }
96 100
     
101
+    /**
102
+     * @param integer $index
103
+     */
97 104
     private function shopApiCallLimitParam($index) {
98 105
         $params = explode("/",$this->response->getHeaderLine('http_x_shopify_shop_api_call_limit'));
99 106
         return (int) $params[$index];
@@ -179,6 +186,9 @@  discard block
 block discarded – undo
179 186
     
180 187
       }
181 188
 
189
+    /**
190
+     * @param string $url
191
+     */
182 192
     private function _urlEncode($url) {
183 193
     
184 194
         $url = str_replace('&', '%26', $url);
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
         $this->api_key = ((isset($config['api_key'])) ? $config['api_key'] : Configure::read('Shopify.api_key'));
38 38
         $this->shared_secret = ((isset($config['shared_secret'])) ? $config['shared_secret'] : Configure::read('Shopify.shared_secret'));
39 39
         $this->scope = ((isset($config['scope'])) ? $config['scope'] : Configure::read('Shopify.scope'));
40
-           $this->is_private_app = ((isset($config['is_private_app'])) ? $config['is_private_app'] : Configure::read('Shopify.is_private_app'));
40
+            $this->is_private_app = ((isset($config['is_private_app'])) ? $config['is_private_app'] : Configure::read('Shopify.is_private_app'));
41 41
         $this->private_app_password = ((isset($config['private_app_password'])) ? $config['private_app_password'] : Configure::read('Shopify.private_app_password'));        
42 42
         
43 43
     }
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
             return false;
131 131
         }
132 132
     
133
-      }
133
+        }
134 134
 
135 135
     public function setNonce($shop_domain) {
136 136
         
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
         $string = implode("&", $dataString);
178 178
         return $query['hmac'] == hash_hmac('sha256', $string, $this->shared_secret);
179 179
     
180
-      }
180
+        }
181 181
 
182 182
     private function _urlEncode($url) {
183 183
     
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -66,13 +66,13 @@  discard block
 block discarded – undo
66 66
         return $this->callLimit() - $this->callsMade();
67 67
     }
68 68
 
69
-    public function call($method, $path, $params=array()) {
69
+    public function call($method, $path, $params = array()) {
70 70
         
71 71
         if (!$this->_isReady()) {
72 72
             return false;
73 73
         }
74 74
         
75
-        if (!in_array($method, array('POST','PUT','GET','DELETE'))) {
75
+        if (!in_array($method, array('POST', 'PUT', 'GET', 'DELETE'))) {
76 76
             return false;    
77 77
         }
78 78
         
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
                             
86 86
         $this->response = $http->{strtolower($method)}(
87 87
             $path,
88
-            ((in_array($method, array('POST','PUT'))) ? json_encode($params) : $params),
89
-            ((in_array($method, array('POST','PUT'))) ? ['type' => 'json'] : [])
88
+            ((in_array($method, array('POST', 'PUT'))) ? json_encode($params) : $params),
89
+            ((in_array($method, array('POST', 'PUT'))) ? ['type' => 'json'] : [])
90 90
         );
91 91
         $this->response = $this->response->json;
92 92
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     }
96 96
     
97 97
     private function shopApiCallLimitParam($index) {
98
-        $params = explode("/",$this->response->getHeaderLine('http_x_shopify_shop_api_call_limit'));
98
+        $params = explode("/", $this->response->getHeaderLine('http_x_shopify_shop_api_call_limit'));
99 99
         return (int) $params[$index];
100 100
     }
101 101
     
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         $response = $http->post('/admin/oauth/access_token', 'client_id=' . $this->api_key . 
122 122
                                     '&client_secret=' . $this->shared_secret .
123 123
                                     '&code=' . $code);
124
-        $response = $response->json;;
124
+        $response = $response->json; ;
125 125
         
126 126
         if (isset($response['access_token'])) {
127 127
             $this->token = $response['access_token'];
Please login to merge, or discard this patch.
src/Controller/InstallController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
       
109 109
             $this->render('validate');
110 110
               
111
-          } elseif (!empty($this->request->data['shop_domain']) && !$this->error) {
111
+            } elseif (!empty($this->request->data['shop_domain']) && !$this->error) {
112 112
             
113 113
             $valid_domain = $this->ShopifyAPI->validDomain(
114 114
                 $this->request->data['shop_domain']
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
                         if ($access_token_entity) {
67 67
                         
68 68
                             $this->request->session()->write([
69
-                                'shopify_access_token_'.$this->ShopifyAPI->api_key => $access_token,
70
-                                'shopify_shop_domain_'.$this->ShopifyAPI->api_key => $this->ShopifyAPI->getShopDomain()
69
+                                'shopify_access_token_' . $this->ShopifyAPI->api_key => $access_token,
70
+                                'shopify_shop_domain_' . $this->ShopifyAPI->api_key => $this->ShopifyAPI->getShopDomain()
71 71
                             ]);
72 72
                         
73 73
                             //$this->Auth->setUser($shop_entity);
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
             if ($valid_domain) {
118 118
                 
119 119
                 $this->request->session()->write([
120
-                    'shopify_shop_domain_'.$this->ShopifyAPI->api_key => $this->request->data['shop_domain']
120
+                    'shopify_shop_domain_' . $this->ShopifyAPI->api_key => $this->request->data['shop_domain']
121 121
                 ]);
122 122
             
123 123
                 $redirect_url = Router::url([
Please login to merge, or discard this patch.
src/Controller/AppController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
      * Initialize AppController
25 25
      *
26 26
      * @return void
27
-    */
27
+     */
28 28
     public function initialize()
29 29
     {
30 30
         parent::initialize();
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,16 +17,14 @@
 block discarded – undo
17 17
 
18 18
 use App\Controller\AppController as BaseController;
19 19
 
20
-class AppController extends BaseController
21
-{
20
+class AppController extends BaseController {
22 21
 
23 22
     /**
24 23
      * Initialize AppController
25 24
      *
26 25
      * @return void
27 26
     */
28
-    public function initialize()
29
-    {
27
+    public function initialize() {
30 28
         parent::initialize();
31 29
         $this->loadComponent('Flash');
32 30
     }
Please login to merge, or discard this patch.
src/Controller/Component/ShopifyDatabaseComponent.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         $query = $this->access_tokens->find();
100 100
         $query = $query->contain(['Shops']);
101 101
         $query = $query->where(['api_key' => $api_key, 'token' => $access_token]);
102
-        $query = $query->where(function ($exp, $q) {
102
+        $query = $query->where(function($exp, $q) {
103 103
             return $exp->isNull('expired_at');
104 104
         });
105 105
                 
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
         $query = $this->access_tokens->find();
119 119
         $query = $query->contain(['Shops']);
120 120
         $query = $query->where(['api_key' => $api_key, 'Shops.myshopify_domain' => $shop_domain]);
121
-        $query = $query->where(function ($exp, $q) {
121
+        $query = $query->where(function($exp, $q) {
122 122
             return $exp->isNull('expired_at');
123 123
         });
124 124
                 
Please login to merge, or discard this patch.
src/Model/Entity/Shop.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,8 +68,7 @@
 block discarded – undo
68 68
  * @property bool $setup_required
69 69
  * @property bool $force_ssl
70 70
  */
71
-class Shop extends Entity
72
-{
71
+class Shop extends Entity {
73 72
 
74 73
     /**
75 74
      * Fields that can be mass assigned using newEntity() or patchEntity().
Please login to merge, or discard this patch.
src/Model/Entity/AccessToken.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,7 @@
 block discarded – undo
27 27
  * @property \Cake\I18n\Time $updated_at
28 28
  * @property \Cake\I18n\Time $expired_at
29 29
  */
30
-class AccessToken extends Entity
31
-{
30
+class AccessToken extends Entity {
32 31
 
33 32
     /**
34 33
      * Fields that can be mass assigned using newEntity() or patchEntity().
Please login to merge, or discard this patch.
src/Model/Table/AccessTokensTable.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,8 +31,7 @@  discard block
 block discarded – undo
31 31
  * @method \Shopify\Model\Entity\AccessToken[] patchEntities($entities, array $data, array $options = [])
32 32
  * @method \Shopify\Model\Entity\AccessToken findOrCreate($search, callable $callback = null)
33 33
  */
34
-class AccessTokensTable extends Table
35
-{
34
+class AccessTokensTable extends Table {
36 35
 
37 36
     /**
38 37
      * Initialize method
@@ -40,8 +39,7 @@  discard block
 block discarded – undo
40 39
      * @param array $config The configuration for the Table.
41 40
      * @return void
42 41
      */
43
-    public function initialize(array $config)
44
-    {
42
+    public function initialize(array $config) {
45 43
         parent::initialize($config);
46 44
 
47 45
         //$this->table('access_tokens');
@@ -58,8 +56,7 @@  discard block
 block discarded – undo
58 56
      * @param \Cake\Validation\Validator $validator Validator instance.
59 57
      * @return \Cake\Validation\Validator
60 58
      */
61
-    public function validationDefault(Validator $validator)
62
-    {
59
+    public function validationDefault(Validator $validator) {
63 60
         $validator
64 61
             ->integer('id')
65 62
             ->allowEmpty('id', 'create');
@@ -101,8 +98,7 @@  discard block
 block discarded – undo
101 98
      * @param \Cake\ORM\RulesChecker $rules The rules object to be modified.
102 99
      * @return \Cake\ORM\RulesChecker
103 100
      */
104
-    public function buildRules(RulesChecker $rules)
105
-    {
101
+    public function buildRules(RulesChecker $rules) {
106 102
         $rules->add($rules->isUnique(['token']));
107 103
 
108 104
         return $rules;
Please login to merge, or discard this patch.
src/Model/Table/ShopsTable.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,8 +31,7 @@  discard block
 block discarded – undo
31 31
  * @method \App\Model\Entity\Shop[] patchEntities($entities, array $data, array $options = [])
32 32
  * @method \App\Model\Entity\Shop findOrCreate($search, callable $callback = null)
33 33
  */
34
-class ShopsTable extends Table
35
-{
34
+class ShopsTable extends Table {
36 35
 
37 36
     /**
38 37
      * Initialize method
@@ -40,8 +39,7 @@  discard block
 block discarded – undo
40 39
      * @param array $config The configuration for the Table.
41 40
      * @return void
42 41
      */
43
-    public function initialize(array $config)
44
-    {
42
+    public function initialize(array $config) {
45 43
         parent::initialize($config);
46 44
 
47 45
         //$this->table('shops');
@@ -60,8 +58,7 @@  discard block
 block discarded – undo
60 58
      * @param \Cake\Validation\Validator $validator Validator instance.
61 59
      * @return \Cake\Validation\Validator
62 60
      */
63
-    public function validationDefault(Validator $validator)
64
-    {
61
+    public function validationDefault(Validator $validator) {
65 62
         $validator
66 63
             ->integer('id')
67 64
             ->allowEmpty('id', 'create');
@@ -258,8 +255,7 @@  discard block
 block discarded – undo
258 255
      * @param \Cake\ORM\RulesChecker $rules The rules object to be modified.
259 256
      * @return \Cake\ORM\RulesChecker
260 257
      */
261
-    public function buildRules(RulesChecker $rules)
262
-    {
258
+    public function buildRules(RulesChecker $rules) {
263 259
         $rules->add($rules->isUnique(['email']));
264 260
 
265 261
         return $rules;
Please login to merge, or discard this patch.
src/Shell/Helper/TableHelper.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,26 +23,26 @@
 block discarded – undo
23 23
 
24 24
     public function output($data, $columns = 10, $terminal_width = 80)
25 25
     {
26
-        while((count($data)%$columns != 0) && ($columns > 5)) {
26
+        while ((count($data) % $columns != 0) && ($columns > 5)) {
27 27
             $columns--;    
28 28
         }
29 29
                  
30 30
         $max_length = max(array_map('strlen', $data));
31 31
         
32
-        while(((($columns * ($max_length+3)) + 3) > $terminal_width) && ($columns >= 1)) {
32
+        while (((($columns * ($max_length + 3)) + 3) > $terminal_width) && ($columns >= 1)) {
33 33
             $columns--;
34 34
         }
35 35
         
36 36
         $this->_io->out(' ' . str_repeat('+-' . str_repeat('-', $max_length) . '-', $columns) . '+ ');
37 37
         
38
-        for($i = 0; $i < count($data); ) {
38
+        for ($i = 0; $i < count($data);) {
39 39
             $output = " ";
40 40
             $j = $i;
41
-            for($k = $i; $k < ($columns+$j); $k++) {
41
+            for ($k = $i; $k < ($columns + $j); $k++) {
42 42
                 if (!isset($data[$i])) {
43 43
                     $data[$i] = '';    
44 44
                 }
45
-                $output .= '| ' . str_repeat(' ', floor(($max_length - strlen($data[$i]))/2)) . $data[$i] . str_repeat(' ', ceil(($max_length - strlen($data[$i]))/2)) . ' ';
45
+                $output .= '| ' . str_repeat(' ', floor(($max_length - strlen($data[$i])) / 2)) . $data[$i] . str_repeat(' ', ceil(($max_length - strlen($data[$i])) / 2)) . ' ';
46 46
                 $i++;
47 47
             }
48 48
             $this->_io->out($output . '|');
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,11 +18,9 @@
 block discarded – undo
18 18
 use Cake\Console\Shell;
19 19
 use Cake\Console\Helper;
20 20
 
21
-class TableHelper extends Helper
22
-{
21
+class TableHelper extends Helper {
23 22
 
24
-    public function output($data, $columns = 10, $terminal_width = 80)
25
-    {
23
+    public function output($data, $columns = 10, $terminal_width = 80) {
26 24
         while((count($data)%$columns != 0) && ($columns > 5)) {
27 25
             $columns--;    
28 26
         }
Please login to merge, or discard this patch.