bb-drummer / my-application

module/UIComponents/src/UIComponents/View/Helper/Components/Element.php

Spacing +3 added lines, -3 removed lines

@@ -33,10 +33,10 @@
      */
     public function __invoke($options = array())
     {
-        if ( is_object($options) && method_exists($options, 'toArray') ) {
+        if (is_object($options) && method_exists($options, 'toArray')) {
             $options = $options->toArray();
-        } else if ( is_object($options) ) {
-            $options = (array)$options;
+        } else if (is_object($options)) {
+            $options = (array) $options;
         }
         
         if (isset($options['container']) && (null !== $options['container'])) {

module/Admin/src/Admin/Model/User.php

Spacing +9 added lines, -9 removed lines

@@ -125,30 +125,30 @@
      */
     public function exchangeArray($data = array(), $forceEncryptPassword = false)
     {
-        if (isset($data['id']) && !empty($data["id"]) ) {
+        if (isset($data['id']) && !empty($data["id"])) {
             $this->id            = ($data['id']);
             $this->user_id        = ($data['id']);
-        } elseif (isset($data['user_id']) && !empty($data["user_id"]) ) {
+        } elseif (isset($data['user_id']) && !empty($data["user_id"])) {
             $this->id            = ($data['user_id']);
             $this->user_id        = ($data['user_id']);
         }
-        $this->username        = (isset($data['username'])) ? $data['username'] : $this->username;
-        $this->email        = (isset($data['email'])) ? $data['email'] : $this->email;
-        if (isset($data['displayName']) ) {
+        $this->username = (isset($data['username'])) ? $data['username'] : $this->username;
+        $this->email = (isset($data['email'])) ? $data['email'] : $this->email;
+        if (isset($data['displayName'])) {
             $this->display_name    = $data['displayName'];
             $this->displayName    = $data['displayName'];
-        } elseif (isset($data['display_name']) ) {
+        } elseif (isset($data['display_name'])) {
             $this->display_name    = $data['display_name'];
             $this->displayName    = $data['display_name'];
         }
-        if (isset($data["password"]) && $forceEncryptPassword ) {
+        if (isset($data["password"]) && $forceEncryptPassword) {
             $bcrypt = new Bcrypt;
             $bcrypt->setCost(null); // @TODO $this->getUserService()->getOptions()->getPasswordCost());
             $data["password"] = $bcrypt->create($data['password']);
         }
-        $this->password        = (isset($data['password'])) ? $data['password'] : $this->password;
+        $this->password = (isset($data['password'])) ? $data['password'] : $this->password;
         $this->state        = (isset($data['state'])) ? $data['state'] : $this->state;
-        $this->aclrole        = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole;
+        $this->aclrole = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole;
         $this->token        = (isset($data['token'])) ? $data['token'] : $this->token;
         
         return $this;

module/UIComponents/src/UIComponents/View/Helper/Utilities.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
     
             $controller = $params['controller'];
             if (isset($params['__NAMESPACE__'])) {
-                $controller = $params['__NAMESPACE__'] . '\\' . $params['controller'];
+                $controller = $params['__NAMESPACE__'].'\\'.$params['controller'];
             }
             $action = $params['action'];
     
@@ -102,8 +102,8 @@ 
     {
         $info = $this->requestInfo();
         if ($info) {
-            $slug = strtolower($info['module']) . '-' . 
-                strtolower($info['controller']) . '-' . 
+            $slug = strtolower($info['module']).'-'. 
+                strtolower($info['controller']).'-'. 
                 strtolower($info['action']);
     
             return $slug;

module/UIComponents/src/UIComponents/View/Helper/Navigation/Menu.php

Spacing +30 added lines, -31 removed lines

@@ -212,7 +212,7 @@ 
         $escaper = $this->view->plugin('escapeHtmlAttr');
 
         if ($found) {
-            $foundPage    = $found['page'];
+            $foundPage = $found['page'];
             $foundDepth = $found['depth'];
         } else {
             $foundPage = null;
@@ -261,34 +261,33 @@ 
 
             // make sure indentation is correct
             $depth -= $minDepth;
-            $myIndent = $indent . str_repeat('    ', $depth);
+            $myIndent = $indent.str_repeat('    ', $depth);
             $attributes = $this->getAttributes();
             if ($depth > $prevDepth) {
                 // start new ul tag
-                $ulClass = '' . 
-                    ($depth == 0 ? $this->getUlClass() : 
-                            ($depth == 1 ? $this->getSubUlClassLevel1() : $this->getSubUlClass())
-                    ) . 
-                    ' level_' . $depth . 
+                $ulClass = ''. 
+                    ($depth == 0 ? $this->getUlClass() : ($depth == 1 ? $this->getSubUlClassLevel1() : $this->getSubUlClass())
+                    ). 
+                    ' level_'.$depth. 
                 '';
-                if ($ulClass && $depth ==    0) {
-                    $ulClass = ' class="' . $escaper($ulClass) . '"';
+                if ($ulClass && $depth == 0) {
+                    $ulClass = ' class="'.$escaper($ulClass).'"';
                 } else {
-                    $ulClass = ' class="' . $escaper($ulClass) . '"';
+                    $ulClass = ' class="'.$escaper($ulClass).'"';
                 }
-                $html .= $myIndent . '<ul' . $ulClass . ' '.($depth == 0 ? $this->htmlAttribs($attributes) : '').'>' . PHP_EOL;
+                $html .= $myIndent.'<ul'.$ulClass.' '.($depth == 0 ? $this->htmlAttribs($attributes) : '').'>'.PHP_EOL;
             } elseif ($prevDepth > $depth) {
                 // close li/ul tags until we're at current depth
                 for ($i = $prevDepth; $i > $depth; $i--) {
-                    $ind = $indent . str_repeat('        ', $i);
-                    $html .= $ind . '    </li>' . PHP_EOL;
-                    $html .= $ind . '</ul>' . PHP_EOL;
+                    $ind = $indent.str_repeat('        ', $i);
+                    $html .= $ind.'    </li>'.PHP_EOL;
+                    $html .= $ind.'</ul>'.PHP_EOL;
                 }
                 // close previous li tag
-                $html .= $myIndent . '    </li>' . PHP_EOL;
+                $html .= $myIndent.'    </li>'.PHP_EOL;
             } else {
                 // close previous li tag
-                $html .= $myIndent . '    </li>' . PHP_EOL;
+                $html .= $myIndent.'    </li>'.PHP_EOL;
             }
 
             // render li tag and page
@@ -308,10 +307,10 @@ 
             if ($addClassToListItem && $page->getClass()) {
                 $liClasses[] = $page->getClass();
             }
-            $liClass = empty($liClasses) ? '' : ' class="' . $escaper(implode(' ', $liClasses)) . '"';
+            $liClass = empty($liClasses) ? '' : ' class="'.$escaper(implode(' ', $liClasses)).'"';
 
-            $html .= $myIndent . '    <li' . $liClass . '>' . PHP_EOL
-                . $myIndent . '        ' . $this->htmlify($page, $escapeLabels, $addClassToListItem) . PHP_EOL;
+            $html .= $myIndent.'    <li'.$liClass.'>'.PHP_EOL
+                . $myIndent.'        '.$this->htmlify($page, $escapeLabels, $addClassToListItem).PHP_EOL;
 
             // store as previous depth for next iteration
             $prevDepth = $depth;
@@ -319,10 +318,10 @@ 
 
         if ($html) {
             // done iterating container; close open ul/li tags
-            for ($i = $prevDepth+1; $i > 0; $i--) {
-                $myIndent = $indent . str_repeat('        ', $i-1);
-                $html .= $myIndent . '    </li>' . PHP_EOL
-                    . $myIndent . '</ul>' . PHP_EOL;
+            for ($i = $prevDepth + 1; $i > 0; $i--) {
+                $myIndent = $indent.str_repeat('        ', $i - 1);
+                $html .= $myIndent.'    </li>'.PHP_EOL
+                    . $myIndent.'</ul>'.PHP_EOL;
             }
             $html = rtrim($html, PHP_EOL);
         }
@@ -353,7 +352,7 @@ 
      */
     public function findActive($container = null, $minDepth = null, $maxDepth = -1)
     {
-    	if ( null == $container ) {
+    	if (null == $container) {
     		$container = $this->getContainer();
     	}
     	return parent::findActive($container, $minDepth, $maxDepth);
@@ -370,7 +369,7 @@ 
      * @param    bool         $addClassToListItem Whether or not to add the page class to the list item
      * @return string
      */
-    public function htmlify(AbstractPage $page, $escapeLabel = true, $addClassToListItem = false, $extraAttributes = [] )
+    public function htmlify(AbstractPage $page, $escapeLabel = true, $addClassToListItem = false, $extraAttributes = [])
     {
         $partial = $this->getHtmlifyPartial();
         if ($partial) {
@@ -380,11 +379,11 @@ 
         $attribs = array_merge([
                 'id'     => $page->getId(),
                 'title'    => $this->translate($page->getTitle(), $page->getTextDomain()),
-                'data-test'    => 'cta-nav-' . $this->slugify($page->getLabel()),
+                'data-test'    => 'cta-nav-'.$this->slugify($page->getLabel()),
         ], $extraAttributes);
         
         $classnames = array();
-        if ( $addClassToListItem === false ) {
+        if ($addClassToListItem === false) {
             $class = $page->getClass();
             if (!empty($class)) {
                 $classnames[] = $page->getClass();
@@ -393,7 +392,7 @@ 
         $maxDepth = $this->getMaxDepth();
         $depth = $page->get('level');
         $isBelowMaxLevel = ($maxDepth > $depth) || ($maxDepth === null) || ($maxDepth === false);
-        if ( !empty($page->pages) && $isBelowMaxLevel ) {
+        if (!empty($page->pages) && $isBelowMaxLevel) {
             $classnames[] = 'dropdown-toggle';
             $attribs['data-toggle'] = (($depth == 0) ? $this->getSubLiClassLevel0() : $this->getSubLiClass());
         }
@@ -412,8 +411,8 @@ 
             $attribs['href'] = '#';
         }
         
-        $html    = '<' . $element . $this->htmlAttribs($attribs) . '>';
-        $html .= ($page->get('icon') ? '<span class="' . $this->getIconPrefixClass() . '' . $page->get('icon') . '"></span> ' : '' );
+        $html = '<'.$element.$this->htmlAttribs($attribs).'>';
+        $html .= ($page->get('icon') ? '<span class="'.$this->getIconPrefixClass().''.$page->get('icon').'"></span> ' : '');
         $label = $this->translate($page->getLabel(), $page->getTextDomain());
         if ($escapeLabel === true) {
             /** @var \Zend\View\Helper\EscapeHtml $escaper */
@@ -422,7 +421,7 @@ 
         } else {
             $html .= $label;
         }
-        $html .= '</' . $element . '>';
+        $html .= '</'.$element.'>';
     
         return $html;
     }

module/UIComponents/src/UIComponents/View/Helper/Components/Languagemenu.php

Spacing +6 added lines, -6 removed lines

@@ -423,7 +423,7 @@ 
                 
         } catch (\Exception $e) {
              
-            $msg = get_class($e) . ': ' . $e->getMessage() . "\n" . $e->getTraceAsString();
+            $msg = get_class($e).': '.$e->getMessage()."\n".$e->getTraceAsString();
             trigger_error($msg, E_USER_ERROR);
             return '';
     
@@ -448,7 +448,7 @@ 
 
         $list     = '';
         $current  = Locale::getDefault();
-        foreach($detector->getSupported() as $locale) {
+        foreach ($detector->getSupported() as $locale) {
             if ($this->omitCurrent() && $current === $locale) {
                 continue;
             }
@@ -463,18 +463,18 @@ 
             $displayName = $this->getLocaleProperty('displayName', $locale, $labelLocale);
 
             $item = sprintf(
-                '<li><a href="%s" title="%s"%s %s>%s</a></li>' . "\n",
+                '<li><a href="%s" title="%s"%s %s>%s</a></li>'."\n",
                 $url,
                 $displayName,
                 ($current === $locale) ? ' class="active"' : '',
                 'data-test="cta-lang-'.$this->slugify($label).'"',
-                (($iconprefixclass) ? '<span class="' . $iconprefixclass . $primary . '"></span> ' : '') . $label
+                (($iconprefixclass) ? '<span class="'.$iconprefixclass.$primary.'"></span> ' : '').$label
             );
 
             $list .= $item;
         }
         $attributes = $this->getAttributes();
-        $html  = 
+        $html = 
             '<ul'.(($class) ? sprintf(' class="%s"', $class) : '').' '.($this->htmlAttribs($attributes)).'>'.
                 '<li'.(($liclass) ? sprintf(' class="%s"', $liclass) : '').'>'.
                     '<a href="" '.
@@ -486,7 +486,7 @@ 
                         'data-test="cta-lang-selector cta-lang-selected-'.$this->slugify(Locale::getDisplayLanguage(null)).'"'.
                     '>'.
                         '<span class="'.(($iconprefixclass) ? $iconprefixclass : '').Locale::getPrimaryLanguage(null).'"></span> '.
-                        ''.Locale::getDisplayLanguage(null). // ' - '.Locale::getDefault().' - '.Locale::getPrimaryLanguage(null).''.
+                        ''.Locale::getDisplayLanguage(null).// ' - '.Locale::getDefault().' - '.Locale::getPrimaryLanguage(null).''.
                         '<span class="caret"></span>'.
                     '</a>'.
                        sprintf(

module/UIComponents/src/UIComponents/View/Helper/Components/Toolbar.php

Spacing +20 added lines, -21 removed lines

@@ -97,7 +97,7 @@ 
         $escaper = $this->view->plugin('escapeHtmlAttr');
 
         if ($found) {
-            $foundPage    = $found['page'];
+            $foundPage = $found['page'];
             $foundDepth = $found['depth'];
         } else {
             $foundPage = null;
@@ -146,28 +146,27 @@ 
 
             // make sure indentation is correct
             $depth -= $minDepth;
-            $myIndent = $indent . str_repeat('    ', $depth);
+            $myIndent = $indent.str_repeat('    ', $depth);
 
             if ($depth > $prevDepth) {
                 // start new ul tag
-                $ulClass = '' . 
-                    ($depth == 0 ? $this->getUlClass() : 
-                            ($depth == 1 ? $this->getSubUlClassLevel1() : $this->getSubUlClass())
-                    ) . 
-                    ' level_' . $depth . 
+                $ulClass = ''. 
+                    ($depth == 0 ? $this->getUlClass() : ($depth == 1 ? $this->getSubUlClassLevel1() : $this->getSubUlClass())
+                    ). 
+                    ' level_'.$depth. 
                 '';
-                if ($ulClass && $depth ==    0) {
-                    $ulClass = ' class="' . $escaper($ulClass) . '"';
+                if ($ulClass && $depth == 0) {
+                    $ulClass = ' class="'.$escaper($ulClass).'"';
                 } else {
-                    $ulClass = ' class="' . $escaper($ulClass) . '"';
+                    $ulClass = ' class="'.$escaper($ulClass).'"';
                 }
-                $html .= $myIndent . '<' . $this->getTagname() . $ulClass . '>' . PHP_EOL;
+                $html .= $myIndent.'<'.$this->getTagname().$ulClass.'>'.PHP_EOL;
             } elseif ($prevDepth > $depth) {
                 // close li/ul tags until we're at current depth
                 for ($i = $prevDepth; $i > $depth; $i--) {
-                    $ind = $indent . str_repeat('        ', $i);
+                    $ind = $indent.str_repeat('        ', $i);
                     //$html .= $ind . '    </li>' . PHP_EOL;
-                    $html .= $ind . '</' . $this->getTagname() . '>' . PHP_EOL;
+                    $html .= $ind.'</'.$this->getTagname().'>'.PHP_EOL;
                 }
                 // close previous li tag
                 //$html .= $myIndent . '    </li>' . PHP_EOL;
@@ -193,12 +192,12 @@ 
             if ($addClassToListItem && $page->getClass()) {
                 $liClasses[] = $page->getClass();
             }
-            $liClass = empty($liClasses) ? '' : ' class="' . $escaper(implode(' ', $liClasses)) . '"';
+            $liClass = empty($liClasses) ? '' : ' class="'.$escaper(implode(' ', $liClasses)).'"';
 
             $html .= /* $myIndent . '    <li' . $liClass . '>' . PHP_EOL
-                . */ $myIndent . '        ' . $this->htmlify($page, $escapeLabels, $addClassToListItem, [
-                    'data-test' => 'cta-toolbar-' . $this->slugify($page->getLabel()),
-                ]) . PHP_EOL;
+                . */ $myIndent.'        '.$this->htmlify($page, $escapeLabels, $addClassToListItem, [
+                    'data-test' => 'cta-toolbar-'.$this->slugify($page->getLabel()),
+                ]).PHP_EOL;
 
             // store as previous depth for next iteration
             $prevDepth = $depth;
@@ -206,10 +205,10 @@ 
 
         if ($html) {
             // done iterating container; close open ul/li tags
-            for ($i = $prevDepth+1; $i > 0; $i--) {
-                $myIndent = $indent . str_repeat('        ', $i-1);
+            for ($i = $prevDepth + 1; $i > 0; $i--) {
+                $myIndent = $indent.str_repeat('        ', $i - 1);
                 $html .= /*$myIndent . '    </li>' . PHP_EOL
-                    . */ $myIndent . '</' . $this->getTagname() . '>' . PHP_EOL;
+                    . */ $myIndent.'</'.$this->getTagname().'>'.PHP_EOL;
             }
             $html = rtrim($html, PHP_EOL);
         }
@@ -232,7 +231,7 @@ 
      * @param string $tagname
      */
     public function setTagname($tagname) {
-        if ( null !== $tagname ) {
+        if (null !== $tagname) {
             $this->tagname = $tagname;
         }
         return $this;

module/UIComponents/src/UIComponents/View/Helper/Components/Breadcrumbs.php

Spacing +11 added lines, -11 removed lines

@@ -112,24 +112,24 @@ 
         /** @var \Zend\View\Helper\EscapeHtml $escaper */
         $escaper = $this->view->plugin('escapeHtml');
         
-        $listHtmlOpen = '<ol class="'.$this->getOlClass().'" data-test="layout-breadcrumbs">' . PHP_EOL;
-        if ( !empty($this->getHeader()) ) {
-            $listHtmlOpen .= '<li class="' . $escaper($this->getHeaderClass()) . '" data-test="layout-breadcrumbs-header">' . $escaper($this->getHeader()) . '</li>' . PHP_EOL;
+        $listHtmlOpen = '<ol class="'.$this->getOlClass().'" data-test="layout-breadcrumbs">'.PHP_EOL;
+        if (!empty($this->getHeader())) {
+            $listHtmlOpen .= '<li class="'.$escaper($this->getHeaderClass()).'" data-test="layout-breadcrumbs-header">'.$escaper($this->getHeader()).'</li>'.PHP_EOL;
         }
         // put the deepest active page last in breadcrumbs
         if ($this->getLinkLast()) {
-            $html = '<li class="active" data-test="layout-breadcrumbs-current">' . $this->htmlify($active) . '</li>' . PHP_EOL;
+            $html = '<li class="active" data-test="layout-breadcrumbs-current">'.$this->htmlify($active).'</li>'.PHP_EOL;
         } else {
-            $html = '<li class="active" data-test="layout-breadcrumbs-current">' . $escaper(
+            $html = '<li class="active" data-test="layout-breadcrumbs-current">'.$escaper(
                 $this->translate($active->getLabel()) //, $active->getTextDomain())
-            ) . '</li>' . PHP_EOL;
+            ).'</li>'.PHP_EOL;
         }
 
         // walk back to root
         while ($parent = $active->getParent()) {
             if ($parent instanceof AbstractPage) {
                 // prepend crumb to html
-                $html = '<li data-test="layout-breadcrumbs-parent'.$parent->getLabel().'">' . $this->htmlify($parent) . '</li>' . PHP_EOL
+                $html = '<li data-test="layout-breadcrumbs-parent'.$parent->getLabel().'">'.$this->htmlify($parent).'</li>'.PHP_EOL
                     //. $this->getSeparator()
                     . $html;
             }
@@ -142,9 +142,9 @@ 
             $active = $parent;
         }
 
-        $listHtmlClose = '</ol>' . PHP_EOL;
+        $listHtmlClose = '</ol>'.PHP_EOL;
         
-        return strlen($html) ? $listHtmlOpen . $this->getIndent() . $html . $listHtmlClose : '';
+        return strlen($html) ? $listHtmlOpen.$this->getIndent().$html.$listHtmlClose : '';
     }
 
     /**
@@ -165,14 +165,14 @@ 
             'class'  => $page->getClass(),
             'href'   => $page->getHref(),
             'target' => $page->getTarget(),
-            'data-test' => 'cta-breadcrumbs-' . $this->slugify($page->getLabel())
+            'data-test' => 'cta-breadcrumbs-'.$this->slugify($page->getLabel())
         ];
 
         /** @var \Zend\View\Helper\EscapeHtml $escaper */
         $escaper = $this->view->plugin('escapeHtml');
         $label   = $escaper($label);
 
-        return '<a' . $this->htmlAttribs($attribs) . '>' . $label . '</a>';
+        return '<a'.$this->htmlAttribs($attribs).'>'.$label.'</a>';
     }
     
     /**

module/UIComponents/src/UIComponents/View/Helper/Traits/ComponentAttributesTrait.php

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
      * @return the $attribute 
      */
     public function getAttribute($name) {
-        return ( isset($this->attributes[$name]) ? $this->attributes[$name] : null );
+        return (isset($this->attributes[$name]) ? $this->attributes[$name] : null);
     }
 
     /**
@@ -46,7 +46,7 @@ 
      * @param mixed $value
      */
     public function setAttribute($attribute, $value = "") {
-        if ( null !== $attribute ) {
+        if (null !== $attribute) {
             $this->attributes[$attribute] = $value;
         }
         return $this;
@@ -67,7 +67,7 @@ 
      * @param array $attributes
      */
     public function setAttributes($attributes) {
-        if ( is_array($attributes) ) {
+        if (is_array($attributes)) {
             $this->attributes = array_merge_recursive($this->attributes, $attributes);
         }
         return $this;
@@ -88,7 +88,7 @@ 
         // except for "data-" and "aria-" attributes
         foreach ($attribs as $key => $value) {
             if ($value === null || (is_string($value) && !strlen($value))) {
-                if ( (strpos($key, "data") === false) && (strpos($key, "aria") === false) ) {
+                if ((strpos($key, "data") === false) && (strpos($key, "aria") === false)) {
                     unset($attribs[$key]);
                 }
             }
@@ -96,9 +96,9 @@ 
 
         $xhtml = '';
         $oView = $this->getView();
-        $escaper        = function ($val) { return $val; };
-        $escapeHtmlAttr = function ($val) { return $val; };
-        if ( ($oView instanceof \Zend\View\Renderer\RendererInterface) ) {
+        $escaper        = function($val) { return $val; };
+        $escapeHtmlAttr = function($val) { return $val; };
+        if (($oView instanceof \Zend\View\Renderer\RendererInterface)) {
             $escaper        = $oView->plugin('escapehtml');
             $escapeHtmlAttr = $oView->plugin('escapehtmlattr');
         }
@@ -133,7 +133,7 @@ 
         return $xhtml;
     }
 
-    public function slugify ($text) {
+    public function slugify($text) {
         $rules = <<<'RULES'
             :: Any-Latin;
             :: NFD;
@@ -147,7 +147,7 @@ 
         RULES;
 
         return \Transliterator::createFromRules($rules)
-            ->transliterate( $text );
+            ->transliterate($text);
     }
 
 }