@@ -83,6 +83,9 @@ discard block |
||
| 83 | 83 | $this->storage = new Storage($this->getStorageDir(), $this->config->imagesDir, $this->config->filesDir); |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | + /** |
|
| 87 | + * @param Request $request |
|
| 88 | + */ |
|
| 86 | 89 | private function redirectMatching($request) |
| 87 | 90 | { |
| 88 | 91 | $redirects = $this->storage->getRedirects()->getRedirects(); |
@@ -112,7 +115,7 @@ discard block |
||
| 112 | 115 | * Loop through sitemap items and see if one matches the requestUri. |
| 113 | 116 | * If it does, add it tot the matchedSitemapItems array |
| 114 | 117 | * |
| 115 | - * @param $request |
|
| 118 | + * @param Request $request |
|
| 116 | 119 | */ |
| 117 | 120 | private function sitemapMatching($request) |
| 118 | 121 | { |
@@ -177,7 +180,7 @@ discard block |
||
| 177 | 180 | * @param array $parameters |
| 178 | 181 | * @param \stdClass|null $matchedSitemapItem |
| 179 | 182 | * |
| 180 | - * @return mixed |
|
| 183 | + * @return Component |
|
| 181 | 184 | * @throws \Exception |
| 182 | 185 | */ |
| 183 | 186 | private function getComponentObject($class = '', $template = '', $parameters = array(), $matchedSitemapItem) |
@@ -268,6 +271,9 @@ discard block |
||
| 268 | 271 | return $this->config->templateDir; |
| 269 | 272 | } |
| 270 | 273 | |
| 274 | + /** |
|
| 275 | + * @return string |
|
| 276 | + */ |
|
| 271 | 277 | public function getStorageDir() |
| 272 | 278 | { |
| 273 | 279 | return $this->config->storageDir; |
@@ -141,8 +141,8 @@ |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
| 144 | - * @param $template |
|
| 145 | - * @param null $application |
|
| 144 | + * @param string $template |
|
| 145 | + * @param null|Application $application |
|
| 146 | 146 | * @return string |
| 147 | 147 | */ |
| 148 | 148 | protected function getTemplatePath($template, $application=null) |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param array $parameters |
| 41 | 41 | * @param $matchedSitemapItem |
| 42 | 42 | */ |
| 43 | - public function __construct($template='', Request $request, $parameters=array(), $matchedSitemapItem) |
|
| 43 | + public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem) |
|
| 44 | 44 | { |
| 45 | 45 | $this->template = $template; |
| 46 | 46 | $this->request = $request; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * |
| 66 | 66 | * @throws \Exception |
| 67 | 67 | */ |
| 68 | - public function render($application=null) |
|
| 68 | + public function render($application = null) |
|
| 69 | 69 | { |
| 70 | 70 | $this->renderedContent = $this->renderTemplate($this->template, true, $application); |
| 71 | 71 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | * @return string |
| 92 | 92 | * @throws \Exception |
| 93 | 93 | */ |
| 94 | - public function renderTemplate($template='', $obClean = true, $application=null) |
|
| 94 | + public function renderTemplate($template = '', $obClean = true, $application = null) |
|
| 95 | 95 | { |
| 96 | 96 | $templatePath = $this->getTemplatePath($template, $application); |
| 97 | 97 | if (realpath($templatePath) !== false) { |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * @return string |
| 126 | 126 | * @throws \Exception |
| 127 | 127 | */ |
| 128 | - public function includeTemplate($template='', $parameters = array()) |
|
| 128 | + public function includeTemplate($template = '', $parameters = array()) |
|
| 129 | 129 | { |
| 130 | 130 | if (is_array($parameters)) { |
| 131 | 131 | foreach ($parameters as $name => $value) { |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | * @param null $application |
| 146 | 146 | * @return string |
| 147 | 147 | */ |
| 148 | - protected function getTemplatePath($template, $application=null) |
|
| 148 | + protected function getTemplatePath($template, $application = null) |
|
| 149 | 149 | { |
| 150 | 150 | $templatePath = $application->getTemplatePath(); |
| 151 | 151 | $templatePath = $templatePath . DIRECTORY_SEPARATOR . $template . '.php'; |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | - * @param $request |
|
| 71 | + * @param Request $request |
|
| 72 | 72 | * @param CmsComponent $cmsComponent |
| 73 | 73 | */ |
| 74 | 74 | private function newRoute($request, $cmsComponent) |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
| 86 | - * @param $request |
|
| 86 | + * @param Request $request |
|
| 87 | 87 | * @param CmsComponent $cmsComponent |
| 88 | 88 | */ |
| 89 | 89 | private function deleteRoute($request, $cmsComponent) |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | /** |
| 183 | - * @param \cc\Request $request |
|
| 183 | + * @param \CloudControl\Cms\cc\Request $request |
|
| 184 | 184 | * @return array |
| 185 | 185 | */ |
| 186 | 186 | private function getPostValues($request) |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | /** |
| 294 | - * @return \cc\Request |
|
| 294 | + * @return \CloudControl\Cms\cc\Request |
|
| 295 | 295 | */ |
| 296 | 296 | private function setPathBackup() |
| 297 | 297 | { |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | /** |
| 308 | - * @param \cc\Request $request |
|
| 308 | + * @param \CloudControl\Cms\cc\Request $request |
|
| 309 | 309 | */ |
| 310 | 310 | private function resetPathBackup($request) |
| 311 | 311 | { |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | /** |
| 320 | - * @param $form |
|
| 320 | + * @param string|null $form |
|
| 321 | 321 | */ |
| 322 | 322 | private function setFormParameter($form) |
| 323 | 323 | { |
@@ -161,7 +161,7 @@ |
||
| 161 | 161 | if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) { |
| 162 | 162 | $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]; |
| 163 | 163 | } else { |
| 164 | - $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true); |
|
| 164 | + $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true); |
|
| 165 | 165 | $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false; |
| 166 | 166 | $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID]; |
| 167 | 167 | } |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * @param string $imagePath |
| 77 | 77 | * @param bool $getExtension |
| 78 | 78 | * |
| 79 | - * @return bool|int|string |
|
| 79 | + * @return integer |
|
| 80 | 80 | */ |
| 81 | 81 | public function getImageMimeType($imagePath, $getExtension = false) |
| 82 | 82 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
| 152 | - * @param $pathToBitmapFile |
|
| 152 | + * @param string $pathToBitmapFile |
|
| 153 | 153 | * |
| 154 | 154 | * @return string |
| 155 | 155 | */ |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
| 168 | - * @param $header |
|
| 168 | + * @param string $header |
|
| 169 | 169 | * |
| 170 | 170 | * @return array |
| 171 | 171 | */ |
@@ -195,14 +195,14 @@ discard block |
||
| 195 | 195 | * Loop through the data in the body of the bitmap |
| 196 | 196 | * file and calculate each individual pixel based on the |
| 197 | 197 | * bytes |
| 198 | - * @param $bodySize |
|
| 199 | - * @param $x |
|
| 198 | + * @param integer $bodySize |
|
| 199 | + * @param integer $x |
|
| 200 | 200 | * @param $width |
| 201 | - * @param $usePadding |
|
| 202 | - * @param $y |
|
| 201 | + * @param boolean $usePadding |
|
| 202 | + * @param integer $y |
|
| 203 | 203 | * @param $height |
| 204 | - * @param $body |
|
| 205 | - * @param $image |
|
| 204 | + * @param string $body |
|
| 205 | + * @param resource $image |
|
| 206 | 206 | */ |
| 207 | 207 | private function loopThroughBodyAndCalculatePixels($bodySize, $x, $width, $usePadding, $y, $height, $body, $image) |
| 208 | 208 | { |
@@ -13,6 +13,10 @@ |
||
| 13 | 13 | { |
| 14 | 14 | protected $imagesDir; |
| 15 | 15 | |
| 16 | + /** |
|
| 17 | + * @param \CloudControl\Cms\storage\Repository $repository |
|
| 18 | + * @param string $imagesDir |
|
| 19 | + */ |
|
| 16 | 20 | public function __construct($repository, $imagesDir) |
| 17 | 21 | { |
| 18 | 22 | parent::__construct($repository); |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | |
| 64 | 64 | // Define the ratio and adjust the width and height |
| 65 | 65 | if ($this->_preserveAspectRatio) { |
| 66 | - $ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight); |
|
| 66 | + $ratio = min($this->_width / $originalWidth, $this->_height / $originalHeight); |
|
| 67 | 67 | $this->_width = $originalWidth * $ratio; |
| 68 | 68 | $this->_height = $originalHeight * $ratio; |
| 69 | 69 | } |
@@ -26,14 +26,14 @@ |
||
| 26 | 26 | |
| 27 | 27 | // Define which ratio will be used, depending on which is the smallest side |
| 28 | 28 | $ratio = min($hRatio, $wRatio); |
| 29 | - if($ratio > 1) $ratio = 1; |
|
| 29 | + if ($ratio > 1) $ratio = 1; |
|
| 30 | 30 | |
| 31 | 31 | // Define sizes |
| 32 | 32 | $this->_destWidth = floor($originalWidth * $ratio); |
| 33 | 33 | $this->_destHeight = floor($originalHeight * $ratio); |
| 34 | 34 | |
| 35 | 35 | // Define margins |
| 36 | - $this->_destX = floor(($this->_width - $this->_destWidth) / 2); |
|
| 36 | + $this->_destX = floor(($this->_width - $this->_destWidth) / 2); |
|
| 37 | 37 | $this->_destY = floor(($this->_height - $this->_destHeight) / 2); |
| 38 | 38 | |
| 39 | 39 | // Execute the Crop method with the given parameters |
@@ -10,5 +10,5 @@ |
||
| 10 | 10 | |
| 11 | 11 | class DutchStopWords extends StopWordsFilter |
| 12 | 12 | { |
| 13 | - protected $stopWords = array('aan','af','al','alles','als','altijd','andere','ben','bij','daar','dan','dat','de','der','deze','die','dit','doch','doen','door','doorgaans','dus','een','eens','en','er','ge','geen','geweest','haar','had','heb','hebben','heeft','hem','het','hier','hij','hoe','hun','iemand','iets','ik','in','is','ja','je','kan','kon','kunnen','maar','me','meer','men','met','mij','mijn','moet','na','naar','niet','niets','nog','nu','of','om','omdat','ons','ook','op','over','reeds','te','tegen','toch','toen','tot','u','uit','uw','van','veel','voor','want','waren','was','wat','we','wel','werd','wezen','wie','wij','wil','worden','zal','ze','zei','zelf','zich','zij','zijn','zo','zodat','zonder','zou'); |
|
| 13 | + protected $stopWords = array('aan', 'af', 'al', 'alles', 'als', 'altijd', 'andere', 'ben', 'bij', 'daar', 'dan', 'dat', 'de', 'der', 'deze', 'die', 'dit', 'doch', 'doen', 'door', 'doorgaans', 'dus', 'een', 'eens', 'en', 'er', 'ge', 'geen', 'geweest', 'haar', 'had', 'heb', 'hebben', 'heeft', 'hem', 'het', 'hier', 'hij', 'hoe', 'hun', 'iemand', 'iets', 'ik', 'in', 'is', 'ja', 'je', 'kan', 'kon', 'kunnen', 'maar', 'me', 'meer', 'men', 'met', 'mij', 'mijn', 'moet', 'na', 'naar', 'niet', 'niets', 'nog', 'nu', 'of', 'om', 'omdat', 'ons', 'ook', 'op', 'over', 'reeds', 'te', 'tegen', 'toch', 'toen', 'tot', 'u', 'uit', 'uw', 'van', 'veel', 'voor', 'want', 'waren', 'was', 'wat', 'we', 'wel', 'werd', 'wezen', 'wie', 'wij', 'wil', 'worden', 'zal', 'ze', 'zei', 'zelf', 'zich', 'zij', 'zijn', 'zo', 'zodat', 'zonder', 'zou'); |
|
| 14 | 14 | } |
| 15 | 15 | \ No newline at end of file |