ggoffy / wggithub

class/SettingsHandler.php

Spacing +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
      */
     public function setPrimarySetting($setId)
     {
-        $helper  = \XoopsModules\Wggithub\Helper::getInstance();
+        $helper = \XoopsModules\Wggithub\Helper::getInstance();
         $settingsObj = null;
         $settingsHandler = $helper->getHandler('Settings');
         if (isset($setId)) {
@@ -158,7 +158,7 @@ 
         }
 
         // reset all
-        $strSQL = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_settings') . ' SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_settings') . '.set_primary = 0';
+        $strSQL = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_settings').' SET '.$GLOBALS['xoopsDB']->prefix('wggithub_settings').'.set_primary = 0';
         $GLOBALS['xoopsDB']->queryF($strSQL);
         // Set Vars
         $settingsObj->setVar('set_primary', 1);

admin/github-api.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 use XoopsModules\Wggithub;
 use XoopsModules\Wggithub\Github;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 // It recovered the value of argument op in URL$
 
 
@@ -41,8 +41,8 @@ 
 
 $count = 0;
 foreach ($data as $key => $repo) {
-    echo "<br>key:" . $key . ' repo:' . $repo['name'];
+    echo "<br>key:".$key.' repo:'.$repo['name'];
     $count++;
-    if ($count>5) {break;}
+    if ($count > 5) {break; }
 }
 echo "<br>OK 2";

admin/logs.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
 use XoopsModules\Wggithub\Constants;
 use XoopsModules\Wggithub\Common;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 // It recovered the value of argument op in URL$
 $op = Request::getCmd('op', 'list');
 // Request log_id
@@ -55,8 +55,8 @@ 
 			}
 			// Display Navigation
 			if ($logsCount > $limit) {
-				include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-				$pagenav = new \XoopsPageNav($logsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+				include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+				$pagenav = new \XoopsPageNav($logsCount, $limit, $start, 'start', 'op=list&limit='.$limit);
 				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
 			}
 		} else {
@@ -134,4 +134,4 @@ 
 		}
 		break;
 }
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

admin/index.php

Spacing +12 added lines, -12 removed lines

@@ -23,8 +23,8 @@ 
 
 use XoopsModules\Wggithub\Common;
 
-include_once \dirname(__DIR__) . '/preloads/autoloader.php';
-require __DIR__ . '/header.php';
+include_once \dirname(__DIR__).'/preloads/autoloader.php';
+require __DIR__.'/header.php';
 
 // Template Index
 $templateMain = 'wggithub_admin_index.tpl';
@@ -40,12 +40,12 @@ 
 // InfoBox Statistics
 $adminObject->addInfoBox(_AM_WGGITHUB_STATISTICS);
 // Info elements
-$adminObject->addInfoBoxLine(\sprintf( '<label>' . _AM_WGGITHUB_THEREARE_SETTINGS . '</label>', $countSettings));
-$adminObject->addInfoBoxLine(\sprintf( '<label>' . _AM_WGGITHUB_THEREARE_DIRECTORIES . '</label>', $countDirectories));
-$adminObject->addInfoBoxLine(\sprintf( '<label>' . _AM_WGGITHUB_THEREARE_LOGS . '</label>', $countLogs));
-$adminObject->addInfoBoxLine(\sprintf( '<label>' . _AM_WGGITHUB_THEREARE_REPOSITORIES . '</label>', $countRepositories));
-$adminObject->addInfoBoxLine(\sprintf( '<label>' . _AM_WGGITHUB_THEREARE_READMES . '</label>', $countReadmes));
-$adminObject->addInfoBoxLine(\sprintf( '<label>' . _AM_WGGITHUB_THEREARE_RELEASES . '</label>', $countReleases));
+$adminObject->addInfoBoxLine(\sprintf('<label>'._AM_WGGITHUB_THEREARE_SETTINGS.'</label>', $countSettings));
+$adminObject->addInfoBoxLine(\sprintf('<label>'._AM_WGGITHUB_THEREARE_DIRECTORIES.'</label>', $countDirectories));
+$adminObject->addInfoBoxLine(\sprintf('<label>'._AM_WGGITHUB_THEREARE_LOGS.'</label>', $countLogs));
+$adminObject->addInfoBoxLine(\sprintf('<label>'._AM_WGGITHUB_THEREARE_REPOSITORIES.'</label>', $countRepositories));
+$adminObject->addInfoBoxLine(\sprintf('<label>'._AM_WGGITHUB_THEREARE_READMES.'</label>', $countReadmes));
+$adminObject->addInfoBoxLine(\sprintf('<label>'._AM_WGGITHUB_THEREARE_RELEASES.'</label>', $countReleases));
 
 // Upload Folders
 $configurator = new Common\Configurator();
@@ -65,12 +65,12 @@ 
 // Test Data
 if ($helper->getConfig('displaySampleButton')) {
 	\xoops_loadLanguage('admin/modulesadmin', 'system');
-	include_once \dirname(__DIR__) . '/testdata/index.php';
-	$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
-	$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
+	include_once \dirname(__DIR__).'/testdata/index.php';
+	$adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
+	$adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
 //	$adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');
 	$adminObject->displayButton('left');
 }
 $GLOBALS['xoopsTpl']->assign('index', $adminObject->displayIndex());
 // End Test Data
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

include/update.php

Spacing +16 added lines, -16 removed lines

@@ -39,7 +39,7 @@ 
     $ret = wggithub_check_db($module);
 
     //check upload directory
-	include_once __DIR__ . '/install.php';
+	include_once __DIR__.'/install.php';
     $ret = xoops_module_install_wggithub($module);
 
     $errors = $module->getErrors();
@@ -61,7 +61,7 @@ 
 {
     global $xoopsDB;
     $result = $xoopsDB->query(
-        'SELECT t1.tpl_id FROM ' . $xoopsDB->prefix('tplfile') . ' t1, ' . $xoopsDB->prefix('tplfile') . ' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
+        'SELECT t1.tpl_id FROM '.$xoopsDB->prefix('tplfile').' t1, '.$xoopsDB->prefix('tplfile').' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
     );
     $tplids = [];
     while (false !== (list($tplid) = $xoopsDB->fetchRow($result))) {
@@ -69,7 +69,7 @@ 
     }
     if (\count($tplids) > 0) {
         $tplfileHandler  = \xoops_getHandler('tplfile');
-        $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '(' . \implode(',', $tplids) . ')', 'IN'));
+        $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '('.\implode(',', $tplids).')', 'IN'));
 
         if (\count($duplicate_files) > 0) {
             foreach (\array_keys($duplicate_files) as $i) {
@@ -77,9 +77,9 @@ 
             }
         }
     }
-    $sql = 'SHOW INDEX FROM ' . $xoopsDB->prefix('tplfile') . " WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
+    $sql = 'SHOW INDEX FROM '.$xoopsDB->prefix('tplfile')." WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br>' . $sql);
+        xoops_error($xoopsDB->error().'<br>'.$sql);
 
         return false;
     }
@@ -92,9 +92,9 @@ 
 
         return true;
     }
-    $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile') . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
+    $sql = 'ALTER TABLE '.$xoopsDB->prefix('tplfile').' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br>' . $sql);
+        xoops_error($xoopsDB->error().'<br>'.$sql);
         $module->setErrors("'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index.");
 
         return false;
@@ -118,12 +118,12 @@ 
     // Example: update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_release';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -132,12 +132,12 @@ 
     // Example: update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_prerelease';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -145,12 +145,12 @@ 
     // Example: update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_readme';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -159,12 +159,12 @@ 
 // Example: update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_directories');
     $field   = 'dir_filterrelease';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `dir_online`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -186,7 +186,7 @@ 
               PRIMARY KEY (`log_id`)
                 ) ENGINE=InnoDB;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when creating table '$table'.");
             $ret = false;
         }

index.php

Spacing +17 added lines, -17 removed lines

@@ -28,15 +28,15 @@ 
     Github\GithubClient
 };
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 $GLOBALS['xoopsOption']['template_main'] = 'wggithub_index.tpl';
-include_once \XOOPS_ROOT_PATH . '/header.php';
+include_once \XOOPS_ROOT_PATH.'/header.php';
 
 // Permissions
 $permGlobalView = $permissionsHandler->getPermGlobalView();
 if (!$permGlobalView) {
     $GLOBALS['xoopsTpl']->assign('error', _NOPERM);
-    require __DIR__ . '/footer.php';
+    require __DIR__.'/footer.php';
 }
 $permGlobalRead   = $permissionsHandler->getPermGlobalRead();
 $permReadmeUpdate = $permissionsHandler->getPermReadmeUpdate();
@@ -50,7 +50,7 @@ 
 
 // Define Stylesheet
 $GLOBALS['xoTheme']->addStylesheet($style, null);
-$GLOBALS['xoTheme']->addStylesheet(WGGITHUB_URL . '/assets/css/tabs.css', null);
+$GLOBALS['xoTheme']->addStylesheet(WGGITHUB_URL.'/assets/css/tabs.css', null);
 $keywords = [];
 // 
 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);
@@ -120,13 +120,13 @@ 
             foreach (\array_keys($directoriesAll) as $i) {
                 $directories[$i] = $directoriesAll[$i]->getValuesDirectories();
                 $dirName = $directoriesAll[$i]->getVar('dir_name');
-                $dirFilterRelease = (bool)$directoriesAll[$i]->getVar('dir_filterrelease');
+                $dirFilterRelease = (bool) $directoriesAll[$i]->getVar('dir_filterrelease');
                 $repos = [];
                 $crRepositories = new \CriteriaCompo();
                 $crRepositories->add(new \Criteria('repo_user', $dirName));
                 $repositoriesCountTotal = $repositoriesHandler->getCount($crRepositories);
                 if ('any' === $filterRelease && $dirFilterRelease) {
-                    $crRepositories->add(new \Criteria('repo_prerelease', 1) );
+                    $crRepositories->add(new \Criteria('repo_prerelease', 1));
                     $crRepositories->add(new \Criteria('repo_release', 1), 'OR');
                 }
                 if ('final' === $filterRelease && $dirFilterRelease) {
@@ -181,9 +181,9 @@ 
                 }
                 $directories[$i]['repos'] = $repos;
                 $directories[$i]['previousRepos'] = $start > 0;
-                $directories[$i]['previousOp'] = '&start=' . ($start - $limit) . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+                $directories[$i]['previousOp'] = '&start='.($start - $limit).'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
                 $directories[$i]['nextRepos'] = ($repositoriesCount - $start) > $limit;
-                $directories[$i]['nextOp'] = '&start=' . ($start + $limit) . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+                $directories[$i]['nextOp'] = '&start='.($start + $limit).'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
                 $GLOBALS['xoopsTpl']->assign('start', $start);
                 $GLOBALS['xoopsTpl']->assign('limit', $limit);
                 $GLOBALS['xoopsTpl']->assign('menu', $menu);
@@ -194,8 +194,8 @@ 
             unset($crDirectories, $directories);
             // Display Navigation
             if ($directoriesCount > $limit) {
-                require_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
-                $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+                require_once \XOOPS_ROOT_PATH.'/class/pagenav.php';
+                $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit='.$limit);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
             }
             $GLOBALS['xoopsTpl']->assign('lang_thereare', \sprintf(\_MA_WGGITHUB_INDEX_THEREARE, $directoriesCount));
@@ -208,11 +208,11 @@ 
         // Permissions
         if (!$permGlobalRead) {
             $GLOBALS['xoopsTpl']->assign('error', \_NOPERM);
-            require __DIR__ . '/footer.php';
+            require __DIR__.'/footer.php';
         }
         $dirName = Request::getString('dir_name', '');
         $result = executeUpdate($dirName);
-        $redir = 'index.php?op=list_afterupdate&start=' . $start . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+        $redir = 'index.php?op=list_afterupdate&start='.$start.'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
         if ($result) {
             \redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);
         } else {
@@ -224,13 +224,13 @@ 
         // Permissions
         if (!$permReadmeUpdate) {
             $GLOBALS['xoopsTpl']->assign('error', \_NOPERM);
-            require __DIR__ . '/footer.php';
+            require __DIR__.'/footer.php';
         }
         $repoId = Request::getInt('repo_id', 0);
         $repoUser  = Request::getString('repo_user', 'none');
         $repoName  = Request::getString('repo_name', 'none');
         $res = $helper->getHandler('Readmes')->updateReadmes($repoId, $repoUser, $repoName);
-        $redir = 'index.php?op=list_afterupdate&start=' . $start . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+        $redir = 'index.php?op=list_afterupdate&start='.$start.'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
         if ($result) {
             \redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);
         } else {
@@ -243,14 +243,14 @@ 
 // Breadcrumbs
 $xoBreadcrumbs[] = ['title' => \_MA_WGGITHUB_INDEX];
 // Keywords
-wggithubMetaKeywords($helper->getConfig('keywords') . ', ' . \implode(',', $keywords));
+wggithubMetaKeywords($helper->getConfig('keywords').', '.\implode(',', $keywords));
 unset($keywords);
 // Description
 wggithubMetaDescription(\_MA_WGGITHUB_INDEX_DESC);
 $GLOBALS['xoopsTpl']->assign('xoops_mpageurl', WGGITHUB_URL.'/index.php');
 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);
 $GLOBALS['xoopsTpl']->assign('wggithub_upload_url', WGGITHUB_UPLOAD_URL);
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';
 
 
 /**
@@ -258,7 +258,7 @@ 
  * @param string $dirName
  * @return bool
  */
-function executeUpdate($dirName = ''){
+function executeUpdate($dirName = '') {
 
     $githubClient = GithubClient::getInstance();
     $helper = Helper::getInstance();

class/Github/Paginator.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 	 */
 	public static function parseLink($link, $rel)
 	{
-		if (!preg_match('(<([^>]+)>;\s*rel="' . preg_quote($rel) . '")', $link, $match)) {
+		if (!preg_match('(<([^>]+)>;\s*rel="'.preg_quote($rel).'")', $link, $match)) {
 			return NULL;
 		}
 

class/Github/Sanity.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 	 */
 	public function & __get($name)
 	{
-		throw new LogicException('Cannot read an undeclared property ' . get_class($this) . "::\$$name.");
+		throw new LogicException('Cannot read an undeclared property '.get_class($this)."::\$$name.");
 	}
 
 
@@ -22,7 +22,7 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		throw new LogicException('Cannot write to an undeclared property ' . get_class($this) . "::\$$name.");
+		throw new LogicException('Cannot write to an undeclared property '.get_class($this)."::\$$name.");
 	}
 
 }

class/Github/Api.php

Spacing +19 added lines, -19 removed lines

@@ -254,7 +254,7 @@ 
 			$urlPath = $this->expandUriTemplate($urlPath, $parameters, $this->defaultParameters);
 		}
 
-		$url = rtrim($baseUrl, '/') . '/' . ltrim($urlPath, '/');
+		$url = rtrim($baseUrl, '/').'/'.ltrim($urlPath, '/');
 
 		if ($content !== NULL && (is_array($content) || is_object($content))) {
 			$headers['Content-Type'] = 'application/json; charset=utf-8';
@@ -394,13 +394,13 @@ 
 			}
 			$parameter = $parameters[$m[2]];
 			unset($parameters[$m[2]]);
-			return $m[1] . rawurlencode($parameter);
+			return $m[1].rawurlencode($parameter);
 		}, $url);
 
 		$url = rtrim($url, '/');
 
 		if (count($parameters)) {
-			$url .= '?' . http_build_query($parameters);
+			$url .= '?'.http_build_query($parameters);
 		}
 
 		return $url;
@@ -421,14 +421,14 @@ 
 		$parameters += $defaultParameters;
 
 		static $operatorFlags = [
-			''  => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
-			'+' => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],
-			'#' => ['prefix' => '#', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],
-			'.' => ['prefix' => '.', 'separator' => '.', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
-			'/' => ['prefix' => '/', 'separator' => '/', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],
-			';' => ['prefix' => ';', 'separator' => ';', 'named' => TRUE,  'ifEmpty' => '',  'reserved' => FALSE],
-			'?' => ['prefix' => '?', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],
-			'&' => ['prefix' => '&', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],
+			''  => ['prefix' => '', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => FALSE],
+			'+' => ['prefix' => '', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => TRUE],
+			'#' => ['prefix' => '#', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => TRUE],
+			'.' => ['prefix' => '.', 'separator' => '.', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => FALSE],
+			'/' => ['prefix' => '/', 'separator' => '/', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => FALSE],
+			';' => ['prefix' => ';', 'separator' => ';', 'named' => TRUE, 'ifEmpty' => '', 'reserved' => FALSE],
+			'?' => ['prefix' => '?', 'separator' => '&', 'named' => TRUE, 'ifEmpty' => '=', 'reserved' => FALSE],
+			'&' => ['prefix' => '&', 'separator' => '&', 'named' => TRUE, 'ifEmpty' => '=', 'reserved' => FALSE],
 		];
 
 		return preg_replace_callback('~{([+#./;?&])?([^}]+?)}~', function($m) use ($url, & $parameters, $operatorFlags) {
@@ -463,17 +463,17 @@ 
 					if ($explode) {
 						$parts = [];
 						if ($isAssoc) {
-							$this->walk($value, function ($v, $k) use (& $parts, $flags, $maxLength) {
+							$this->walk($value, function($v, $k) use (& $parts, $flags, $maxLength) {
 								$parts[] = $this->prefix(['named' => TRUE] + $flags, $k, $this->escape($flags, $v, $maxLength));
 							});
 
 						} elseif ($flags['named']) {
-							$this->walk($value, function ($v) use (& $parts, $flags, $name, $maxLength) {
+							$this->walk($value, function($v) use (& $parts, $flags, $name, $maxLength) {
 								$parts[] = $this->prefix($flags, $name, $this->escape($flags, $v, $maxLength));
 							});
 
 						} else {
-							$this->walk($value, function ($v) use (& $parts, $flags, $maxLength) {
+							$this->walk($value, function($v) use (& $parts, $flags, $maxLength) {
 								$parts[] = $this->escape($flags, $v, $maxLength);
 							});
 						}
@@ -504,7 +504,7 @@ 
 			}
 
 			if (isset($translated[0])) {
-				return $flags['prefix'] . implode($flags['separator'], $translated);
+				return $flags['prefix'].implode($flags['separator'], $translated);
 			}
 
 			return '';
@@ -530,7 +530,7 @@ 
 			}
 		}
 
-		return $prefix . $value;
+		return $prefix.$value;
 	}
 
 
@@ -545,7 +545,7 @@ 
 		$value = (string) $value;
 
 		if ($maxLength !== NULL) {
-			if (preg_match('~^(.{' . $maxLength . '}).~u', $value, $m)) {
+			if (preg_match('~^(.{'.$maxLength.'}).~u', $value, $m)) {
 				$value = $m[1];
 			} elseif (strlen($value) > $maxLength) {  # when malformed UTF-8
 				$value = substr($value, 0, $maxLength);
@@ -558,7 +558,7 @@ 
 
 			$escaped = '';
 			for ($i = 0, $count = count($parts); $i < $count; $i += 2) {
-				$escaped .= rawurlencode($parts[$i]) . $parts[$i + 1];
+				$escaped .= rawurlencode($parts[$i]).$parts[$i + 1];
 			}
 
 			return $escaped;
@@ -596,7 +596,7 @@ 
 
 		if (isset($content->errors)) {
 			$message .= implode(', ', array_map(function($error) {
-				return '[' . implode(':', (array) $error) . ']';
+				return '['.implode(':', (array) $error).']';
 			}, $content->errors));
 		}