Completed
Push — develop ( e691b9...6a5e00 )
by John
06:52
created
Alpha/Controller/ListActiveRecordsController.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
      *
97 97
      * @param alpha\Util\Http\Request $request
98 98
      *
99
-     * @return alpha\Util\Http\Response
99
+     * @return Response
100 100
      *
101 101
      * @since 1.0
102 102
      */
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
      *
121 121
      * @param alpha\Util\Http\Request $request
122 122
      *
123
-     * @return alpha\Util\Http\Response
123
+     * @return Response
124 124
      *
125 125
      * @since 1.0
126 126
      */
Please login to merge, or discard this patch.
Alpha/Model/Article.php 3 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,6 @@
 block discarded – undo
8 8
 use Alpha\Model\Type\Boolean;
9 9
 use Alpha\Model\Type\Relation;
10 10
 use Alpha\Util\Logging\Logger;
11
-use Alpha\Util\Config\Configprovider;
12 11
 use Alpha\Util\Http\Session\SessionProviderFactory;
13 12
 use Alpha\Exception\ValidationException;
14 13
 use Alpha\Exception\FileNotFoundException;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -452,7 +452,7 @@
 block discarded – undo
452 452
         }
453 453
 
454 454
         if ($vote_count > 0) {
455
-            $score = $total_score / $vote_count;
455
+            $score = $total_score/$vote_count;
456 456
         }
457 457
 
458 458
         return sprintf('%01.2f', $score);
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
     /**
436 436
      * Method for returning the calculated score for this article.
437 437
      *
438
-     * @return float
438
+     * @return string
439 439
      *
440 440
      * @since 1.0
441 441
      */
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
     /**
532 532
      * Loads the content of the ArticleObject from the specified file path.
533 533
      *
534
-     * @param $filePath
534
+     * @param string $filePath
535 535
      *
536 536
      * @since 1.0
537 537
      *
Please login to merge, or discard this patch.
Alpha/Util/Config/ConfigProvider.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@
 block discarded – undo
115 115
     /**
116 116
      * Get config value.
117 117
      *
118
-     * @param $key string
118
+     * @param string $key string
119 119
      *
120 120
      * @return string
121 121
      *
Please login to merge, or discard this patch.
Alpha/Util/Http/Session/SessionProviderInterface.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,6 +50,7 @@  discard block
 block discarded – undo
50 50
      * Starts a new session, or resumes an existing session if there is already a session ID available.
51 51
      *
52 52
      * @since 2.0
53
+     * @return void
53 54
      */
54 55
     public function init();
55 56
 
@@ -57,13 +58,14 @@  discard block
 block discarded – undo
57 58
      * Destroys the current session.
58 59
      *
59 60
      * @since 2.0
61
+     * @return void
60 62
      */
61 63
     public function destroy();
62 64
 
63 65
     /**
64 66
      * Get the key value from the session.  Returns false if nothing is found.
65 67
      *
66
-     * @param $key
68
+     * @param string $key
67 69
      *
68 70
      * @since 2.0
69 71
      *
@@ -78,6 +80,7 @@  discard block
 block discarded – undo
78 80
      * @param mixed  $value
79 81
      *
80 82
      * @since 2.0
83
+     * @return void
81 84
      */
82 85
     public function set($key, $value);
83 86
 
@@ -85,9 +88,9 @@  discard block
 block discarded – undo
85 88
      * Deletes the value provided at that key in the session.
86 89
      *
87 90
      * @param string $key
88
-     * @param mixed  $value
89 91
      *
90 92
      * @since 2.0
93
+     * @return void
91 94
      */
92 95
     public function delete($key);
93 96
 
Please login to merge, or discard this patch.
Alpha/Util/Image/ImageUtils.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
     /**
110 110
      * Saves the GD image resource to the file path indicated.
111 111
      *
112
-     * @param image  $imageResource The GD image resource to save
112
+     * @param resource  $imageResource The GD image resource to save
113 113
      * @param string $type          The image type (jpg, png, or gif)
114 114
      * @param string $destination   The desination file path of the image file to create
115 115
      *
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
         list($originalWidth, $originalHeight) = $imageInfo;
96 96
 
97 97
         if ($originalWidth > $originalHeight) {
98
-            $originalX = floor(($originalWidth - $originalHeight) / 2);
98
+            $originalX = floor(($originalWidth-$originalHeight)/2);
99 99
             $sourceWidth = $sourceHeight = $originalHeight;
100 100
         } else {
101 101
             $sourceWidth = $sourceHeight = $originalWidth;
Please login to merge, or discard this patch.
Alpha/Util/Logging/LogProviderFile.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@
 block discarded – undo
132 132
     /**
133 133
      * Returns the size in megabytes of the log file on disc.
134 134
      *
135
-     * @return float
135
+     * @return integer
136 136
      *
137 137
      * @since 1.0
138 138
      */
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
         clearstatcache();
147 147
         $size = filesize($this->path);
148 148
 
149
-        return ($size / 1024) /1024;
149
+        return ($size/1024)/1024;
150 150
     }
151 151
 
152 152
     /**
Please login to merge, or discard this patch.
Alpha/View/Widget/Image.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@
 block discarded – undo
153 153
     /**
154 154
      * The constructor.
155 155
      *
156
-     * @param $source
156
+     * @param string $source
157 157
      * @param $width
158 158
      * @param $height
159 159
      * @param $sourceType
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
             }
243 243
         } else {
244 244
             // make a cache dir for the article
245
-            $cacheDir = $config->get('app.file.store.dir').'cache/images/article_'.mb_substr($this->source, mb_strpos($this->source, 'attachments/article_') + 20, 11);
245
+            $cacheDir = $config->get('app.file.store.dir').'cache/images/article_'.mb_substr($this->source, mb_strpos($this->source, 'attachments/article_')+20, 11);
246 246
             if (!file_exists($cacheDir)) {
247 247
                 $success = mkdir($cacheDir);
248 248
 
@@ -300,11 +300,11 @@  discard block
 block discarded – undo
300 300
             $targetScreenY = $targetScreenResolution[1];
301 301
 
302 302
             // calculate the new units we will scale by
303
-            $xu = $targetScreenX / $originalScreenX;
304
-            $yu = $targetScreenY / $originalScreenY;
303
+            $xu = $targetScreenX/$originalScreenX;
304
+            $yu = $targetScreenY/$originalScreenY;
305 305
 
306
-            $this->width = new Integer(intval($this->width->getValue() * $xu));
307
-            $this->height = new Integer(intval($this->height->getValue() * $yu));
306
+            $this->width = new Integer(intval($this->width->getValue()*$xu));
307
+            $this->height = new Integer(intval($this->height->getValue()*$yu));
308 308
 
309 309
             // need to update the cache filename as the dimensions have changed
310 310
             $this->setFilename();
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
                 if ($this->sourceType->getValue() == 'png' && $config->get('cms.images.perserve.png')) {
369 369
                     imagepng($new_image);
370 370
                 } else {
371
-                    imagejpeg($new_image, null, 100 * $this->quality->getValue());
371
+                    imagejpeg($new_image, null, 100*$this->quality->getValue());
372 372
                 }
373 373
 
374 374
                 $this->cache($new_image);
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
         if ($this->sourceType->getValue() == 'png' && $config->get('cms.images.perserve.png')) {
393 393
             imagepng($image, $this->filename);
394 394
         } else {
395
-            imagejpeg($image, $this->filename, 100 * $this->quality->getValue());
395
+            imagejpeg($image, $this->filename, 100*$this->quality->getValue());
396 396
         }
397 397
     }
398 398
 
Please login to merge, or discard this patch.
public/index.php 2 patches
Unused Use Statements   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,15 +2,15 @@
 block discarded – undo
2 2
 
3 3
 require_once __DIR__.'/../vendor/autoload.php';
4 4
 
5
-use Alpha\Controller\Front\FrontController;
6
-use Alpha\Util\Config\ConfigProvider;
7
-use Alpha\Util\Http\Filter\ClientBlacklistFilter;
8
-use Alpha\Util\Http\Filter\IPBlacklistFilter;
9
-use Alpha\Util\Http\Filter\ClientTempBlacklistFilter;
10
-use Alpha\Util\Http\Request;
11
-use Alpha\Util\Http\Response;
12
-use Alpha\Exception\ResourceNotFoundException;
13
-use Alpha\Exception\ResourceNotAllowedException;
5
+use Alpha\Controller\Front\FrontController;
6
+use Alpha\Util\Config\ConfigProvider;
7
+use Alpha\Util\Http\Filter\ClientBlacklistFilter;
8
+use Alpha\Util\Http\Filter\IPBlacklistFilter;
9
+use Alpha\Util\Http\Filter\ClientTempBlacklistFilter;
10
+use Alpha\Util\Http\Request;
11
+use Alpha\Util\Http\Response;
12
+use Alpha\Exception\ResourceNotFoundException;
13
+use Alpha\Exception\ResourceNotAllowedException;
14 14
 use Alpha\View\View;
15 15
 
16 16
 try {
Please login to merge, or discard this patch.
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -14,36 +14,36 @@
 block discarded – undo
14 14
 use Alpha\View\View;
15 15
 
16 16
 try {
17
-	$config = ConfigProvider::getInstance();
17
+    $config = ConfigProvider::getInstance();
18 18
 
19
-	set_exception_handler('Alpha\Util\ErrorHandlers::catchException');
20
-	set_error_handler('Alpha\Util\ErrorHandlers::catchError', $config->get('php.error.log.level'));
19
+    set_exception_handler('Alpha\Util\ErrorHandlers::catchException');
20
+    set_error_handler('Alpha\Util\ErrorHandlers::catchError', $config->get('php.error.log.level'));
21 21
 
22
-	$front = new FrontController();
22
+    $front = new FrontController();
23 23
 	
24
-	if ($config->get('security.client.blacklist.filter.enabled')) {
25
-		$front->registerFilter(new ClientBlacklistFilter());
26
-	}
24
+    if ($config->get('security.client.blacklist.filter.enabled')) {
25
+        $front->registerFilter(new ClientBlacklistFilter());
26
+    }
27 27
 
28
-	if ($config->get('security.ip.blacklist.filter.enabled')) {
29
-		$front->registerFilter(new IPBlacklistFilter());
30
-	}
28
+    if ($config->get('security.ip.blacklist.filter.enabled')) {
29
+        $front->registerFilter(new IPBlacklistFilter());
30
+    }
31 31
 
32
-	if ($config->get('security.client.temp.blacklist.filter.enabled')) {
33
-		$front->registerFilter(new ClientTempBlacklistFilter());
34
-	}
32
+    if ($config->get('security.client.temp.blacklist.filter.enabled')) {
33
+        $front->registerFilter(new ClientTempBlacklistFilter());
34
+    }
35 35
 
36
-	$request = new Request();
37
-	$response = $front->process($request);
36
+    $request = new Request();
37
+    $response = $front->process($request);
38 38
 
39 39
 } catch (ResourceNotFoundException $rnfe) {
40
-	$response = new Response(404, View::renderErrorPage(404, $rnfe->getMessage(), array('Content-Type' => 'text/html')));
40
+    $response = new Response(404, View::renderErrorPage(404, $rnfe->getMessage(), array('Content-Type' => 'text/html')));
41 41
 } catch (ResourceNotAllowedException $rnae) {
42
-	$response = new Response(403, View::renderErrorPage(403, $rnae->getMessage(), array('Content-Type' => 'text/html')));
42
+    $response = new Response(403, View::renderErrorPage(403, $rnae->getMessage(), array('Content-Type' => 'text/html')));
43 43
 }
44 44
 
45 45
 if ($config->get('security.http.header.x.frame.options') != '' && $response->getHeader('X-Frame-Options') == null) {
46
-	$response->setHeader('X-Frame-Options', $config->get('security.http.header.x.frame.options'));
46
+    $response->setHeader('X-Frame-Options', $config->get('security.http.header.x.frame.options'));
47 47
 }
48 48
 
49 49
 echo $response->send();
Please login to merge, or discard this patch.
phpunit.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -9,19 +9,19 @@
 block discarded – undo
9 9
 $config = ConfigProvider::getInstance();
10 10
 
11 11
 $dirs = array(
12
-	$config->get('app.file.store.dir').'logs',
13
-	$config->get('app.file.store.dir').'cache',
14
-	$config->get('app.file.store.dir').'cache/html',
15
-	$config->get('app.file.store.dir').'cache/images',
16
-	$config->get('app.file.store.dir').'cache/pdf',
17
-	$config->get('app.file.store.dir').'cache/xls',
18
-	$config->get('app.file.store.dir').'attachments',
19
-	);
12
+    $config->get('app.file.store.dir').'logs',
13
+    $config->get('app.file.store.dir').'cache',
14
+    $config->get('app.file.store.dir').'cache/html',
15
+    $config->get('app.file.store.dir').'cache/images',
16
+    $config->get('app.file.store.dir').'cache/pdf',
17
+    $config->get('app.file.store.dir').'cache/xls',
18
+    $config->get('app.file.store.dir').'attachments',
19
+    );
20 20
 
21 21
 foreach ($dirs as $dir) {
22
-	if (!file_exists($dir)) {
23
-		mkdir($dir, 0774);
24
-	}
22
+    if (!file_exists($dir)) {
23
+        mkdir($dir, 0774);
24
+    }
25 25
 }
26 26
 
27 27
 ?>
28 28
\ No newline at end of file
Please login to merge, or discard this patch.