Inspection of "Merge branch 'develop'" - jenskooij/cloudcontrol - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 333d57...1a2f46 )

by Jens

created 2018-01-10 08:45 UTC

Status

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -12,11 +12,11 @@  discard block
 block discarded – undo
 			<div class="form-element">
 				<label for="<?=$field->slug?>"><?=$field->title?></label>
 				<? if (isset($dynamicBrick)) :
-					$fieldSlug = $field->slug;
-					$value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
-				else :
-					$value = '';
-				endif ?>
+                    $fieldSlug = $field->slug;
+                    $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
+                else :
+                    $value = '';
+                endif ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 				<ul class="grid-wrapper sortable">
 					<li class="grid-container">
@@ -44,10 +44,10 @@  discard block
 block discarded – undo
 						</div>
 					</li>
 					<? if (isset($dynamicBrick)) :
-						$fieldSlug = $field->slug;
-						$iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
-						array_shift($iterable);
-						?>
+                        $fieldSlug = $field->slug;
+                        $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
+                        array_shift($iterable);
+                        ?>
 						<? foreach ($iterable as $value) : ?>
 
 						<li class="grid-container">
@@ -70,10 +70,10 @@  discard block
 block discarded – undo
 				<a class="btn js-addmultiple">+</a>
 				<? elseif ($field->multiple == true) : ?>
 					<? if (isset($dynamicBrick)) :
-						$fieldSlug = $field->slug;
-						$iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
-						array_shift($iterable);
-						?>
+                        $fieldSlug = $field->slug;
+                        $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
+                        array_shift($iterable);
+                        ?>
 						<? foreach ($iterable as $value) : ?>
 
 						<li>

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -14,8 +14,10 @@
 block discarded – undo
 				<? if (isset($dynamicBrick)) :
 					$fieldSlug = $field->slug;
 					$value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
-				else :
+				else {
+				    :
 					$value = '';
+				}
 				endif ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 				<ul class="grid-wrapper sortable">

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 								</div>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 						<? endforeach ?>
 					<? endif ?>
 				</ul>
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
 							<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 					<? endforeach ?>
 					<? endif ?>
 					</div>
@@ -92,5 +92,5 @@  discard block
 block discarded – undo
 				<a class="btn js-addrtemultiple">+</a>
 				<? endif ?>
 			</div>
-			<?$value='';?>
+			<?$value = ''; ?>
 		<? endforeach ?>

Please login to merge, or discard this patch.

src/templates/documents/document-form-form.php 3 patches

Indentation +37 added lines, -37 removed lines patch added patch discarded remove patch

@@ -22,11 +22,11 @@  discard block
 block discarded – undo
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
 					<? if (isset($document)) :
-						$fieldSlug = $field->slug;
-						$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
-					else :
-						$value = '';
-					endif ?>
+                        $fieldSlug = $field->slug;
+                        $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
+                    else :
+                        $value = '';
+                    endif ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 					<ul class="grid-wrapper sortable">
 						<li class="grid-container">
@@ -54,10 +54,10 @@  discard block
 block discarded – undo
 							</div>
 						</li>
 						<? if (isset($document)) :
-							$fieldSlug = $field->slug;
-							$iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
-							array_shift($iterable);
-							?>
+                            $fieldSlug = $field->slug;
+                            $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
+                            array_shift($iterable);
+                            ?>
 							<? foreach ($iterable as $value) : ?>
 
 							<li class="grid-container">
@@ -80,10 +80,10 @@  discard block
 block discarded – undo
 					<a class="btn js-addmultiple">+</a>
 					<? elseif ($field->multiple == true) : ?>
 						<? if (isset($document)) :
-							$fieldSlug = $field->slug;
-							$iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
-							array_shift($iterable);
-							?>
+                            $fieldSlug = $field->slug;
+                            $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
+                            array_shift($iterable);
+                            ?>
 							<? foreach ($iterable as $value) : ?>
 
 							<li>
@@ -118,10 +118,10 @@  discard block
 block discarded – undo
 							<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
 								<? foreach ($brickArray as $dynamicBrick) : ?>
 									<? foreach ($bricks as $brick) :
-										if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) {
-											break;
-										}
-									endforeach ?>
+                                        if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) {
+                                            break;
+                                        }
+                                    endforeach ?>
 									<? if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) : ?>
 									<li class="brick form-element">
 
@@ -142,12 +142,12 @@  discard block
 block discarded – undo
 						<div class="form-element">
 						<label for="<?=$field->slug?>"><?=$field->title?></label>
 						<? if (isset($document)) :
-							$brickSlug = $brick->slug;
-							$fieldSlug = $field->slug;
-							$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
-						else :
-							$value = '';
-						endif ?>
+                            $brickSlug = $brick->slug;
+                            $fieldSlug = $field->slug;
+                            $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
+                        else :
+                            $value = '';
+                        endif ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 						<ul class="grid-wrapper sortable">
 							<li class="grid-container">
@@ -175,11 +175,11 @@  discard block
 block discarded – undo
 								</div>
 							</li>
 							<? if (isset($document)) :
-								$brickSlug = $brick->slug;
-								$fieldSlug = $field->slug;
-								$iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
-								array_shift($iterable);
-								?>
+                                $brickSlug = $brick->slug;
+                                $fieldSlug = $field->slug;
+                                $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
+                                array_shift($iterable);
+                                ?>
 								<? foreach ($iterable as $value) : ?>
 
 								<li class="grid-container">
@@ -202,11 +202,11 @@  discard block
 block discarded – undo
 						<a class="btn js-addmultiple">+</a>
 						<? elseif ($field->multiple == true) : ?>
 							<? if (isset($document)) :
-								$brickSlug = $brick->slug;
-								$fieldSlug = $field->slug;
-								$iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
-								array_shift($iterable);
-								?>
+                                $brickSlug = $brick->slug;
+                                $fieldSlug = $field->slug;
+                                $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
+                                array_shift($iterable);
+                                ?>
 								<? foreach ($iterable as $value) : ?>
 
 								<li>
@@ -246,10 +246,10 @@  discard block
 block discarded – undo
 				<? if (isset($document)) : ?>
 					<? foreach ($document->dynamicBricks as $dynamicBrick) : ?>
 						<? foreach ($bricks as $brick) :
-						if ($brick->slug == $dynamicBrick->type) {
-							break;
-						}
-						endforeach ?>
+                        if ($brick->slug == $dynamicBrick->type) {
+                            break;
+                        }
+                        endforeach ?>
 						<li class="brick form-element">
 							<label><?=$brick->title?></label>
 							<?$static = false; ?>

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
                     <input required="required" value="<?=isset($document) ? $document->title : '' ?>"<?= isset($document, $document->title) && !empty($document->title) ? ' readonly="readonly"' : '' ?> type="text" id="title" name="title" placeholder="Title" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix = 'fields'; ?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
 									</div>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 							<? endforeach ?>
 						<? endif ?>
 					</ul>
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 								<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 						<? endforeach ?>
 						<? endif ?>
 						</div>
@@ -102,17 +102,17 @@  discard block
 block discarded – undo
 					<a class="btn js-addrtemultiple">+</a>
 					<? endif ?>
 				</div>
-				<?$value='';?>
+				<?$value = ''; ?>
 			<? endforeach ?>
 			<hr />
-			<? $static_brick_nr = 0;?>
+			<? $static_brick_nr = 0; ?>
 			<? foreach ($documentType->bricks as $brick) : ?>
 			<div class="brick">
 				<label><?=$brick->title?></label>
 				<? if ($brick->multiple == 'true') : ?>
 					<input type="hidden" value="<?=$brick->brickSlug?>"/>
 					<input type="hidden" value="<?=$brick->slug?>"/>
-					<?$myBrickSlug=$brick->slug;?>
+					<?$myBrickSlug = $brick->slug; ?>
 					<ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable">
 						<? if (isset($document)) : ?>
 							<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
 				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+					<?$fieldPrefix = 'bricks[' . $brick->slug . '][fields]'; ?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
 										</div>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 								<? endforeach ?>
 							<? endif ?>
 						</ul>
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
 									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 							<? endforeach ?>
 							<? endif ?>
 							</div>
@@ -225,12 +225,12 @@  discard block
 block discarded – undo
 						<a class="btn js-addrtemultiple">+</a>
 						<? endif ?>
 					</div>
-					<?$value='';?>
+					<?$value = ''; ?>
 				<? endforeach ?>
 				<? endif ?>
 				</div>
 				<hr />
-			<? endforeach;?>
+			<? endforeach; ?>
 
 
 

Please login to merge, or discard this patch.

Braces +16 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,7 +1,8 @@  discard block
 block discarded – undo
 <form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?= isset($formId) ? '#' . $formId : '' ?>">
     <? if (!isset($hideTitleAndState)) : ?>
       <input type="hidden" name="path" value="<?= $request::$get['path'] ?>"/>
-    <? else : ?>
+    <? else {
+    : ?>
       <input type="hidden" name="formId" value="<?= $formId ?>"/>
       <a name="<?= $formId ?>"></a>
     <? endif ?>
@@ -17,15 +18,19 @@  discard block
 block discarded – undo
                     <input required="required" value="<?=isset($document) ? $document->title : '' ?>"<?= isset($document, $document->title) && !empty($document->title) ? ' readonly="readonly"' : '' ?> type="text" id="title" name="title" placeholder="Title" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix='fields';
+}
+?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
 					<? if (isset($document)) :
 						$fieldSlug = $field->slug;
 						$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
-					else :
+					else {
+					    :
 						$value = '';
+					}
 					endif ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 					<ul class="grid-wrapper sortable">
@@ -135,8 +140,11 @@  discard block
 block discarded – undo
 					</ul>
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
-				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+				<? else {
+    : ?>
+					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';
+}
+?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -145,8 +153,10 @@  discard block
 block discarded – undo
 							$brickSlug = $brick->slug;
 							$fieldSlug = $field->slug;
 							$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
-						else :
+						else {
+						    :
 							$value = '';
+						}
 						endif ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 						<ul class="grid-wrapper sortable">

Please login to merge, or discard this patch.

src/components/BaseComponent.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -45,7 +45,7 @@
 block discarded – undo
         {
             $this->template = $template;
             $this->request = $request;
-            $this->parameters = (array)$parameters;
+            $this->parameters = (array) $parameters;
             $this->matchedSitemapItem = $matchedSitemapItem;
         }
 

Please login to merge, or discard this patch.

Doc Comments +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -96,7 +96,7 @@  discard block
 block discarded – undo
          * @param null | Application $application
          * @param Application $application
          *
-         * @return mixed|string
+         * @return string|null
          * @throws \Exception
          */
         public function renderTemplate($template = '', $obClean = true, $application = null)
@@ -141,8 +141,9 @@  discard block
 block discarded – undo
         }
 
         /**
-         * @param $template
+         * @param string $template
          * @param null | Application $application
+         * @param Application $application
          * @return string
          */
         protected function getTemplateDir($template, $application = null)

Please login to merge, or discard this patch.

src/components/FormComponent.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -163,7 +163,7 @@
 block discarded – undo
         if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
             $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
         } else {
-            $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
+            $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true);
             $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
             $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
         }

Please login to merge, or discard this patch.

src/images/methods/BoxCrop.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -27,7 +27,9 @@
 block discarded – undo
 
             // Define which ratio will be used, depending on which is the smallest side
             $ratio = min($hRatio, $wRatio);
-            if ($ratio > 1) $ratio = 1;
+            if ($ratio > 1) {
+                $ratio = 1;
+            }
 
             // Define sizes
             $this->_destWidth = floor($originalWidth * $ratio);

Please login to merge, or discard this patch.

src/images/methods/SmartCrop.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -37,7 +37,9 @@
 block discarded – undo
 
             // Define which ratio will be used, depending on which is the biggest side
             $ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
-            if ($ratio < 1) $ratio = 1;
+            if ($ratio < 1) {
+                $ratio = 1;
+            }
 
             // Calculate the destination width, height, x and y
             $this->_destWidth = $originalWidth / $ratio;

Please login to merge, or discard this patch.

src/cc/StringUtil.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -20,7 +20,7 @@
 block discarded – undo
     public static function slugify($str, $replace = array(), $delimiter = '-')
     {
         if (!empty($replace)) {
-            $str = str_replace((array)$replace, ' ', $str);
+            $str = str_replace((array) $replace, ' ', $str);
         }
 
         $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);

Please login to merge, or discard this patch.

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch

		@@ -78,12 +78,15 @@
		block discarded – undo
78	78	*/
79	79	public static function humanFileSize($size, $unit = "")
80	80	{
81		- if ((!$unit && $size >= 1 << 30) \|\| $unit == "GB")
82		- return number_format($size / (1 << 30), 2) . "GB";
83		- if ((!$unit && $size >= 1 << 20) \|\| $unit == "MB")
84		- return number_format($size / (1 << 20), 2) . "MB";
85		- if ((!$unit && $size >= 1 << 10) \|\| $unit == "KB")
86		- return number_format($size / (1 << 10), 2) . "KB";
	81	+ if ((!$unit && $size >= 1 << 30) \|\| $unit == "GB") {
	82	+ return number_format($size / (1 << 30), 2) . "GB";
	83	+ }
	84	+ if ((!$unit && $size >= 1 << 20) \|\| $unit == "MB") {
	85	+ return number_format($size / (1 << 20), 2) . "MB";
	86	+ }
	87	+ if ((!$unit && $size >= 1 << 10) \|\| $unit == "KB") {
	88	+ return number_format($size / (1 << 10), 2) . "KB";
	89	+ }
87	90
88	91	return number_format($size) . " bytes";
89	92	}

Please login to merge, or discard this patch.

src/storage/Repository.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -151,7 +151,7 @@
 block discarded – undo
     public function save()
     {
         $host = $this;
-        array_map(function ($value) use ($host) {
+        array_map(function($value) use ($host) {
             $host->saveSubset($value);
         }, $this->fileBasedSubsets);
     }

Please login to merge, or discard this patch.

src/util/functions.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -55,9 +55,9 @@  discard block
 block discarded – undo
 {
     if (!isset($_GET['unsanitized'])) {
         $search = array(
-            '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-            '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-            '/(\s)+/s',         // shorten multiple whitespace sequences
+            '/\>[^\S ]+/s', // strip whitespaces after tags, except space
+            '/[^\S ]+\</s', // strip whitespaces before tags, except space
+            '/(\s)+/s', // shorten multiple whitespace sequences
             '/<!--(.|\s)*?-->/' // Remove HTML comments
         );
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
  */
 function utf8Convert($array)
 {
-    array_walk_recursive($array, function (&$item) {
+    array_walk_recursive($array, function(&$item) {
         if (!mb_detect_encoding($item, 'utf-8', true)) {
             $item = utf8_encode($item);
         }

Please login to merge, or discard this patch.

		@@ -163,7 +163,7 @@
		block discarded – undo
163	163	if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
164	164	$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
165	165	} else {
166		- $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
	166	+ $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true);
167	167	$_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
168	168	$this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
169	169	}

		@@ -12,11 +12,11 @@ discard block
		block discarded – undo
12	12	<div class="form-element">
13	13	<label for="<?=$field->slug?>"><?=$field->title?></label>
14	14	<? if (isset($dynamicBrick)) :
15		- $fieldSlug = $field->slug;
16		- $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
17		- else :
18		- $value = '';
19		- endif ?>
	15	+ $fieldSlug = $field->slug;
	16	+ $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
	17	+ else :
	18	+ $value = '';
	19	+ endif ?>
20	20	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
21	21	<ul class="grid-wrapper sortable">
22	22	<li class="grid-container">
		@@ -44,10 +44,10 @@ discard block
		block discarded – undo
44	44	</div>
45	45	</li>
46	46	<? if (isset($dynamicBrick)) :
47		- $fieldSlug = $field->slug;
48		- $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
49		- array_shift($iterable);
50		- ?>
	47	+ $fieldSlug = $field->slug;
	48	+ $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
	49	+ array_shift($iterable);
	50	+ ?>
51	51	<? foreach ($iterable as $value) : ?>
52	52
53	53	<li class="grid-container">
		@@ -70,10 +70,10 @@ discard block
		block discarded – undo
70	70	<a class="btn js-addmultiple">+</a>
71	71	<? elseif ($field->multiple == true) : ?>
72	72	<? if (isset($dynamicBrick)) :
73		- $fieldSlug = $field->slug;
74		- $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
75		- array_shift($iterable);
76		- ?>
	73	+ $fieldSlug = $field->slug;
	74	+ $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
	75	+ array_shift($iterable);
	76	+ ?>
77	77	<? foreach ($iterable as $value) : ?>
78	78
79	79	<li>

		@@ -14,8 +14,10 @@
		block discarded – undo
14	14	<? if (isset($dynamicBrick)) :
15	15	$fieldSlug = $field->slug;
16	16	$value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
17		- else :
	17	+ else {
	18	+ :
18	19	$value = '';
	20	+ }
19	21	endif ?>
20	22	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
21	23	<ul class="grid-wrapper sortable">

		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	</div>
64	64	</div>
65	65	</li>
66		- <?$value='';?>
	66	+ <?$value = ''; ?>
67	67	<? endforeach ?>
68	68	<? endif ?>
69	69	</ul>
		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83	<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
84	84	</div>
85	85	</li>
86		- <?$value='';?>
	86	+ <?$value = ''; ?>
87	87	<? endforeach ?>
88	88	<? endif ?>
89	89	</div>
		@@ -92,5 +92,5 @@ discard block
		block discarded – undo
92	92	<a class="btn js-addrtemultiple">+</a>
93	93	<? endif ?>
94	94	</div>
95		- <?$value='';?>
	95	+ <?$value = ''; ?>
96	96	<? endforeach ?>

		@@ -22,11 +22,11 @@ discard block
		block discarded – undo
22	22	<div class="form-element">
23	23	<label for="<?=$field->slug?>"><?=$field->title?></label>
24	24	<? if (isset($document)) :
25		- $fieldSlug = $field->slug;
26		- $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
27		- else :
28		- $value = '';
29		- endif ?>
	25	+ $fieldSlug = $field->slug;
	26	+ $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
	27	+ else :
	28	+ $value = '';
	29	+ endif ?>
30	30	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
31	31	<ul class="grid-wrapper sortable">
32	32	<li class="grid-container">
		@@ -54,10 +54,10 @@ discard block
		block discarded – undo
54	54	</div>
55	55	</li>
56	56	<? if (isset($document)) :
57		- $fieldSlug = $field->slug;
58		- $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
59		- array_shift($iterable);
60		- ?>
	57	+ $fieldSlug = $field->slug;
	58	+ $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
	59	+ array_shift($iterable);
	60	+ ?>
61	61	<? foreach ($iterable as $value) : ?>
62	62
63	63	<li class="grid-container">
		@@ -80,10 +80,10 @@ discard block
		block discarded – undo
80	80	<a class="btn js-addmultiple">+</a>
81	81	<? elseif ($field->multiple == true) : ?>
82	82	<? if (isset($document)) :
83		- $fieldSlug = $field->slug;
84		- $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
85		- array_shift($iterable);
86		- ?>
	83	+ $fieldSlug = $field->slug;
	84	+ $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
	85	+ array_shift($iterable);
	86	+ ?>
87	87	<? foreach ($iterable as $value) : ?>
88	88
89	89	<li>
		@@ -118,10 +118,10 @@ discard block
		block discarded – undo
118	118	<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
119	119	<? foreach ($brickArray as $dynamicBrick) : ?>
120	120	<? foreach ($bricks as $brick) :
121		- if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) {
122		- break;
123		- }
124		- endforeach ?>
	121	+ if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) {
	122	+ break;
	123	+ }
	124	+ endforeach ?>
125	125	<? if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) : ?>
126	126	<li class="brick form-element">
127	127
		@@ -142,12 +142,12 @@ discard block
		block discarded – undo
142	142	<div class="form-element">
143	143	<label for="<?=$field->slug?>"><?=$field->title?></label>
144	144	<? if (isset($document)) :
145		- $brickSlug = $brick->slug;
146		- $fieldSlug = $field->slug;
147		- $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
148		- else :
149		- $value = '';
150		- endif ?>
	145	+ $brickSlug = $brick->slug;
	146	+ $fieldSlug = $field->slug;
	147	+ $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
	148	+ else :
	149	+ $value = '';
	150	+ endif ?>
151	151	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
152	152	<ul class="grid-wrapper sortable">
153	153	<li class="grid-container">
		@@ -175,11 +175,11 @@ discard block
		block discarded – undo
175	175	</div>
176	176	</li>
177	177	<? if (isset($document)) :
178		- $brickSlug = $brick->slug;
179		- $fieldSlug = $field->slug;
180		- $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
181		- array_shift($iterable);
182		- ?>
	178	+ $brickSlug = $brick->slug;
	179	+ $fieldSlug = $field->slug;
	180	+ $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
	181	+ array_shift($iterable);
	182	+ ?>
183	183	<? foreach ($iterable as $value) : ?>
184	184
185	185	<li class="grid-container">
		@@ -202,11 +202,11 @@ discard block
		block discarded – undo
202	202	<a class="btn js-addmultiple">+</a>
203	203	<? elseif ($field->multiple == true) : ?>
204	204	<? if (isset($document)) :
205		- $brickSlug = $brick->slug;
206		- $fieldSlug = $field->slug;
207		- $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
208		- array_shift($iterable);
209		- ?>
	205	+ $brickSlug = $brick->slug;
	206	+ $fieldSlug = $field->slug;
	207	+ $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
	208	+ array_shift($iterable);
	209	+ ?>
210	210	<? foreach ($iterable as $value) : ?>
211	211
212	212	<li>
		@@ -246,10 +246,10 @@ discard block
		block discarded – undo
246	246	<? if (isset($document)) : ?>
247	247	<? foreach ($document->dynamicBricks as $dynamicBrick) : ?>
248	248	<? foreach ($bricks as $brick) :
249		- if ($brick->slug == $dynamicBrick->type) {
250		- break;
251		- }
252		- endforeach ?>
	249	+ if ($brick->slug == $dynamicBrick->type) {
	250	+ break;
	251	+ }
	252	+ endforeach ?>
253	253	<li class="brick form-element">
254	254	<label><?=$brick->title?></label>
255	255	<?$static = false; ?>

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	<input required="required" value="<?=isset($document) ? $document->title : '' ?>"<?= isset($document, $document->title) && !empty($document->title) ? ' readonly="readonly"' : '' ?> type="text" id="title" name="title" placeholder="Title" />
18	18	</div>
19	19	<? endif ?>
20		- <?$fieldPrefix='fields';?>
	20	+ <?$fieldPrefix = 'fields'; ?>
21	21	<? foreach ($documentType->fields as $field) : ?>
22	22	<div class="form-element">
23	23	<label for="<?=$field->slug?>"><?=$field->title?></label>
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	</div>
74	74	</div>
75	75	</li>
76		- <?$value='';?>
	76	+ <?$value = ''; ?>
77	77	<? endforeach ?>
78	78	<? endif ?>
79	79	</ul>
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
94	94	</div>
95	95	</li>
96		- <?$value='';?>
	96	+ <?$value = ''; ?>
97	97	<? endforeach ?>
98	98	<? endif ?>
99	99	</div>
		@@ -102,17 +102,17 @@ discard block
		block discarded – undo
102	102	<a class="btn js-addrtemultiple">+</a>
103	103	<? endif ?>
104	104	</div>
105		- <?$value='';?>
	105	+ <?$value = ''; ?>
106	106	<? endforeach ?>
107	107	<hr />
108		- <? $static_brick_nr = 0;?>
	108	+ <? $static_brick_nr = 0; ?>
109	109	<? foreach ($documentType->bricks as $brick) : ?>
110	110	<div class="brick">
111	111	<label><?=$brick->title?></label>
112	112	<? if ($brick->multiple == 'true') : ?>
113	113	<input type="hidden" value="<?=$brick->brickSlug?>"/>
114	114	<input type="hidden" value="<?=$brick->slug?>"/>
115		- <?$myBrickSlug=$brick->slug;?>
	115	+ <?$myBrickSlug = $brick->slug; ?>
116	116	<ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable">
117	117	<? if (isset($document)) : ?>
118	118	<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
137	137	<?$static_brick_nr += 1?>
138	138	<? else : ?>
139		- <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
	139	+ <?$fieldPrefix = 'bricks[' . $brick->slug . '][fields]'; ?>
140	140	<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
141	141	<? foreach ($brick->structure->fields as $field) : ?>
142	142	<div class="form-element">
		@@ -195,7 +195,7 @@ discard block
		block discarded – undo
195	195	</div>
196	196	</div>
197	197	</li>
198		- <?$value='';?>
	198	+ <?$value = ''; ?>
199	199	<? endforeach ?>
200	200	<? endif ?>
201	201	</ul>
		@@ -216,7 +216,7 @@ discard block
		block discarded – undo
216	216	<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
217	217	</div>
218	218	</li>
219		- <?$value='';?>
	219	+ <?$value = ''; ?>
220	220	<? endforeach ?>
221	221	<? endif ?>
222	222	</div>
		@@ -225,12 +225,12 @@ discard block
		block discarded – undo
225	225	<a class="btn js-addrtemultiple">+</a>
226	226	<? endif ?>
227	227	</div>
228		- <?$value='';?>
	228	+ <?$value = ''; ?>
229	229	<? endforeach ?>
230	230	<? endif ?>
231	231	</div>
232	232	<hr />
233		- <? endforeach;?>
	233	+ <? endforeach; ?>
234	234
235	235
236	236

		@@ -1,7 +1,8 @@ discard block
		block discarded – undo
1	1	<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?= isset($formId) ? '#' . $formId : '' ?>">
2	2	<? if (!isset($hideTitleAndState)) : ?>
3	3	<input type="hidden" name="path" value="<?= $request::$get['path'] ?>"/>
4		- <? else : ?>
	4	+ <? else {
	5	+ : ?>
5	6	<input type="hidden" name="formId" value="<?= $formId ?>"/>
6	7	<a name="<?= $formId ?>"></a>
7	8	<? endif ?>
		@@ -17,15 +18,19 @@ discard block
		block discarded – undo
17	18	<input required="required" value="<?=isset($document) ? $document->title : '' ?>"<?= isset($document, $document->title) && !empty($document->title) ? ' readonly="readonly"' : '' ?> type="text" id="title" name="title" placeholder="Title" />
18	19	</div>
19	20	<? endif ?>
20		- <?$fieldPrefix='fields';?>
	21	+ <?$fieldPrefix='fields';
	22	+}
	23	+?>
21	24	<? foreach ($documentType->fields as $field) : ?>
22	25	<div class="form-element">
23	26	<label for="<?=$field->slug?>"><?=$field->title?></label>
24	27	<? if (isset($document)) :
25	28	$fieldSlug = $field->slug;
26	29	$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
27		- else :
	30	+ else {
	31	+ :
28	32	$value = '';
	33	+ }
29	34	endif ?>
30	35	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
31	36	<ul class="grid-wrapper sortable">
		@@ -135,8 +140,11 @@ discard block
		block discarded – undo
135	140	</ul>
136	141	<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
137	142	<?$static_brick_nr += 1?>
138		- <? else : ?>
139		- <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
	143	+ <? else {
	144	+ : ?>
	145	+ <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';
	146	+}
	147	+?>
140	148	<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
141	149	<? foreach ($brick->structure->fields as $field) : ?>
142	150	<div class="form-element">
		@@ -145,8 +153,10 @@ discard block
		block discarded – undo
145	153	$brickSlug = $brick->slug;
146	154	$fieldSlug = $field->slug;
147	155	$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
148		- else :
	156	+ else {
	157	+ :
149	158	$value = '';
	159	+ }
150	160	endif ?>
151	161	<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
152	162	<ul class="grid-wrapper sortable">

		@@ -45,7 +45,7 @@
		block discarded – undo
45	45	{
46	46	$this->template = $template;
47	47	$this->request = $request;
48		- $this->parameters = (array)$parameters;
	48	+ $this->parameters = (array) $parameters;
49	49	$this->matchedSitemapItem = $matchedSitemapItem;
50	50	}
51	51

		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	* @param null \| Application $application
97	97	* @param Application $application
98	98	*
99		- * @return mixed\|string
	99	+ * @return string\|null
100	100	* @throws \Exception
101	101	*/
102	102	public function renderTemplate($template = '', $obClean = true, $application = null)
		@@ -141,8 +141,9 @@ discard block
		block discarded – undo
141	141	}
142	142
143	143	/**
144		- * @param $template
	144	+ * @param string $template
145	145	* @param null \| Application $application
	146	+ * @param Application $application
146	147	* @return string
147	148	*/
148	149	protected function getTemplateDir($template, $application = null)

		@@ -27,7 +27,9 @@
		block discarded – undo
27	27
28	28	// Define which ratio will be used, depending on which is the smallest side
29	29	$ratio = min($hRatio, $wRatio);
30		- if ($ratio > 1) $ratio = 1;
	30	+ if ($ratio > 1) {
	31	+ $ratio = 1;
	32	+ }
31	33
32	34	// Define sizes
33	35	$this->_destWidth = floor($originalWidth * $ratio);

		@@ -37,7 +37,9 @@
		block discarded – undo
37	37
38	38	// Define which ratio will be used, depending on which is the biggest side
39	39	$ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
40		- if ($ratio < 1) $ratio = 1;
	40	+ if ($ratio < 1) {
	41	+ $ratio = 1;
	42	+ }
41	43
42	44	// Calculate the destination width, height, x and y
43	45	$this->_destWidth = $originalWidth / $ratio;

		@@ -20,7 +20,7 @@
		block discarded – undo
20	20	public static function slugify($str, $replace = array(), $delimiter = '-')
21	21	{
22	22	if (!empty($replace)) {
23		- $str = str_replace((array)$replace, ' ', $str);
	23	+ $str = str_replace((array) $replace, ' ', $str);
24	24	}
25	25
26	26	$clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);

		@@ -151,7 +151,7 @@
		block discarded – undo
151	151	public function save()
152	152	{
153	153	$host = $this;
154		- array_map(function ($value) use ($host) {
	154	+ array_map(function($value) use ($host) {
155	155	$host->saveSubset($value);
156	156	}, $this->fileBasedSubsets);
157	157	}

		@@ -55,9 +55,9 @@ discard block
		block discarded – undo
55	55	{
56	56	if (!isset($_GET['unsanitized'])) {
57	57	$search = array(
58		- '/\>[^\S ]+/s', // strip whitespaces after tags, except space
59		- '/[^\S ]+\</s', // strip whitespaces before tags, except space
60		- '/(\s)+/s', // shorten multiple whitespace sequences
	58	+ '/\>[^\S ]+/s', // strip whitespaces after tags, except space
	59	+ '/[^\S ]+\</s', // strip whitespaces before tags, except space
	60	+ '/(\s)+/s', // shorten multiple whitespace sequences
61	61	'/<!--(.\|\s)*?-->/' // Remove HTML comments
62	62	);
63	63
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	*/
86	86	function utf8Convert($array)
87	87	{
88		- array_walk_recursive($array, function (&$item) {
	88	+ array_walk_recursive($array, function(&$item) {
89	89	if (!mb_detect_encoding($item, 'utf-8', true)) {
90	90	$item = utf8_encode($item);
91	91	}

jenskooij / cloudcontrol

Push — master ( 333d57...1a2f46 )

Status

Category

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +37 added lines, -37 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Braces +16 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +9 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch