@@ -194,7 +194,7 @@ |
||
| 194 | 194 | * |
| 195 | 195 | * @param string $frontMatterKey The current hierarchy of the Front Matter keys being used |
| 196 | 196 | * @param string $expandableValue The Front Matter value that will be expanded |
| 197 | - * @param array $arrayVariableNames The Front Matter variable names that reference arrays |
|
| 197 | + * @param string[] $arrayVariableNames The Front Matter variable names that reference arrays |
|
| 198 | 198 | * |
| 199 | 199 | * @return array |
| 200 | 200 | * |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | * |
| 62 | 62 | * @param array $rawFrontMatter |
| 63 | 63 | */ |
| 64 | - public function __construct(&$rawFrontMatter) |
|
| 64 | + public function __construct (&$rawFrontMatter) |
|
| 65 | 65 | { |
| 66 | 66 | $this->expansionUsed = false; |
| 67 | 67 | $this->nestingLevel = 0; |
@@ -100,7 +100,9 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | private function handleDateField () |
| 102 | 102 | { |
| 103 | - if (!isset($this->frontMatter['date'])) { return; } |
|
| 103 | + if (!isset($this->frontMatter['date'])) |
|
| 104 | + { |
|
| 105 | +return; } |
|
| 104 | 106 | |
| 105 | 107 | $date = &$this->frontMatter['date']; |
| 106 | 108 | $itemDate = $this->guessDateTime($date); |
@@ -258,7 +260,9 @@ discard block |
||
| 258 | 260 | |
| 259 | 261 | if (is_array($value) || is_bool($value)) |
| 260 | 262 | { |
| 261 | - if ($ignoreArrays) { continue; } |
|
| 263 | + if ($ignoreArrays) |
|
| 264 | + { |
|
| 265 | +continue; } |
|
| 262 | 266 | |
| 263 | 267 | throw new YamlUnsupportedVariableException("Yaml variable `$variable` for `$key` is not a supported data type."); |
| 264 | 268 | } |
@@ -348,6 +352,8 @@ discard block |
||
| 348 | 352 | { |
| 349 | 353 | return (new \DateTime($guess)); |
| 350 | 354 | } |
| 351 | - catch (\Exception $e) { return false; } |
|
| 355 | + catch (\Exception $e) |
|
| 356 | + { |
|
| 357 | +return false; } |
|
| 352 | 358 | } |
| 353 | 359 | } |
| 354 | 360 | \ No newline at end of file |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | /** |
| 33 | 33 | * Get all of the DataItems and DataSets in this manager |
| 34 | 34 | * |
| 35 | - * @return array |
|
| 35 | + * @return string |
|
| 36 | 36 | */ |
| 37 | 37 | public function getDataItems () |
| 38 | 38 | { |
@@ -64,7 +64,9 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public function parseDataItems ($folders) |
| 66 | 66 | { |
| 67 | - if ($folders === null) { return; } |
|
| 67 | + if ($folders === null) |
|
| 68 | + { |
|
| 69 | +return; } |
|
| 68 | 70 | |
| 69 | 71 | foreach ($folders as $folder) |
| 70 | 72 | { |
@@ -84,7 +86,9 @@ discard block |
||
| 84 | 86 | */ |
| 85 | 87 | public function parseDataSets ($dataSets) |
| 86 | 88 | { |
| 87 | - if ($dataSets === null) { return; } |
|
| 89 | + if ($dataSets === null) |
|
| 90 | + { |
|
| 91 | +return; } |
|
| 88 | 92 | |
| 89 | 93 | /** |
| 90 | 94 | * The information which each DataSet has from the configuration file |
@@ -90,6 +90,9 @@ |
||
| 90 | 90 | $this->targetDir = &$folder; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | + /** |
|
| 94 | + * @param \allejo\stakx\Object\Configuration $configuration |
|
| 95 | + */ |
|
| 93 | 96 | public function configureTwig ($configuration, $options) |
| 94 | 97 | { |
| 95 | 98 | $this->twigOpts['configuration'] = $configuration; |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | /** |
| 59 | 59 | * PageManager constructor |
| 60 | 60 | */ |
| 61 | - public function __construct() |
|
| 61 | + public function __construct () |
|
| 62 | 62 | { |
| 63 | 63 | parent::__construct(); |
| 64 | 64 | |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | /** |
| 229 | 229 | * {@inheritdoc} |
| 230 | 230 | */ |
| 231 | - public function isTracked($filePath) |
|
| 231 | + public function isTracked ($filePath) |
|
| 232 | 232 | { |
| 233 | 233 | return (parent::isTracked($filePath) || isset($this->twigExtendsDeps[$filePath])); |
| 234 | 234 | } |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | /** |
| 237 | 237 | * {@inheritdoc} |
| 238 | 238 | */ |
| 239 | - public function refreshItem($filePath) |
|
| 239 | + public function refreshItem ($filePath) |
|
| 240 | 240 | { |
| 241 | 241 | if (parent::isTracked($filePath)) |
| 242 | 242 | { |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | /** |
| 257 | 257 | * {@inheritdoc} |
| 258 | 258 | */ |
| 259 | - protected function handleTrackableItem($filePath, $options = array()) |
|
| 259 | + protected function handleTrackableItem ($filePath, $options = array()) |
|
| 260 | 260 | { |
| 261 | 261 | $pageView = PageView::create($filePath); |
| 262 | 262 | $namespace = $pageView->getType(); |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | { |
| 535 | 535 | $filePath = $this->fs->getRelativePath($parent->getSourceContext()->getPath()); |
| 536 | 536 | |
| 537 | - $this->twigExtendsDeps[$filePath][(string)$pageView->getFilePath()] = &$pageView; |
|
| 537 | + $this->twigExtendsDeps[$filePath][(string) $pageView->getFilePath()] = &$pageView; |
|
| 538 | 538 | $parent = $parent->getParent(array()); |
| 539 | 539 | } |
| 540 | 540 | } |
@@ -161,7 +161,9 @@ discard block |
||
| 161 | 161 | */ |
| 162 | 162 | public function parsePageViews ($pageViewFolders) |
| 163 | 163 | { |
| 164 | - if (empty($pageViewFolders)) { return; } |
|
| 164 | + if (empty($pageViewFolders)) |
|
| 165 | + { |
|
| 166 | +return; } |
|
| 165 | 167 | |
| 166 | 168 | /** |
| 167 | 169 | * The name of the folder where PageViews are located |
@@ -343,7 +345,9 @@ discard block |
||
| 343 | 345 | */ |
| 344 | 346 | private function handleTrackableStaticPageView ($pageView) |
| 345 | 347 | { |
| 346 | - if (empty($pageView['title'])) { return; } |
|
| 348 | + if (empty($pageView['title'])) |
|
| 349 | + { |
|
| 350 | +return; } |
|
| 347 | 351 | |
| 348 | 352 | $this->addToSiteMenu($pageView); |
| 349 | 353 | $this->flatPages[$pageView['title']] = $pageView->createJail(); |
@@ -611,7 +615,9 @@ discard block |
||
| 611 | 615 | */ |
| 612 | 616 | private function trackParentTwigTemplate ($template, &$pageView) |
| 613 | 617 | { |
| 614 | - if (!$this->tracking) { return; } |
|
| 618 | + if (!$this->tracking) |
|
| 619 | + { |
|
| 620 | +return; } |
|
| 615 | 621 | |
| 616 | 622 | /** @var Twig_Template $parent */ |
| 617 | 623 | $parent = $template->getParent(array()); |
@@ -163,6 +163,9 @@ |
||
| 163 | 163 | return $this->configuration['twig']['autoescape']; |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | + /** |
|
| 167 | + * @return false|string |
|
| 168 | + */ |
|
| 166 | 169 | public function getRedirectTemplate () |
| 167 | 170 | { |
| 168 | 171 | return $this->configuration['templates']['redirect']; |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | /** |
| 35 | 35 | * Configuration constructor. |
| 36 | 36 | */ |
| 37 | - public function __construct() |
|
| 37 | + public function __construct () |
|
| 38 | 38 | { |
| 39 | 39 | $this->configuration = array(); |
| 40 | 40 | $this->fs = new Filesystem(); |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | /** |
| 65 | 65 | * {@inheritdoc} |
| 66 | 66 | */ |
| 67 | - public function setLogger(LoggerInterface $logger) |
|
| 67 | + public function setLogger (LoggerInterface $logger) |
|
| 68 | 68 | { |
| 69 | 69 | $this->output = $logger; |
| 70 | 70 | } |
@@ -318,7 +318,7 @@ |
||
| 318 | 318 | /** |
| 319 | 319 | * Get the original file path |
| 320 | 320 | * |
| 321 | - * @return string |
|
| 321 | + * @return SplFileInfo |
|
| 322 | 322 | */ |
| 323 | 323 | final public function getFilePath () |
| 324 | 324 | { |
@@ -392,7 +392,9 @@ |
||
| 392 | 392 | */ |
| 393 | 393 | final public function deleteFrontMatter ($key) |
| 394 | 394 | { |
| 395 | - if (!isset($this->writableFrontMatter[$key])) { return; } |
|
| 395 | + if (!isset($this->writableFrontMatter[$key])) |
|
| 396 | + { |
|
| 397 | +return; } |
|
| 396 | 398 | |
| 397 | 399 | unset($this->writableFrontMatter[$key]); |
| 398 | 400 | } |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | |
| 85 | 85 | if (!$this->fs->exists($filePath)) |
| 86 | 86 | { |
| 87 | - throw new FileNotFoundException("The following file could not be found: ${filePath}"); |
|
| 87 | + throw new FileNotFoundException("The following file could not be found: ${filepath}"); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | $this->extension = strtolower($this->fs->getExtension($filePath)); |
@@ -322,6 +322,9 @@ discard block |
||
| 322 | 322 | $this->noClean = $noClean; |
| 323 | 323 | } |
| 324 | 324 | |
| 325 | + /** |
|
| 326 | + * @param string $filePath |
|
| 327 | + */ |
|
| 325 | 328 | private function creationWatcher ($filePath) |
| 326 | 329 | { |
| 327 | 330 | $this->output->writeln(sprintf("File creation detected: %s", $filePath)); |
@@ -363,6 +366,9 @@ discard block |
||
| 363 | 366 | } |
| 364 | 367 | } |
| 365 | 368 | |
| 369 | + /** |
|
| 370 | + * @param string $filePath |
|
| 371 | + */ |
|
| 366 | 372 | private function modificationWatcher ($filePath) |
| 367 | 373 | { |
| 368 | 374 | $this->output->writeln(sprintf("File change detected: %s", $filePath)); |
@@ -139,11 +139,11 @@ discard block |
||
| 139 | 139 | $this->pm->configureTwig($this->getConfiguration(), array( |
| 140 | 140 | 'safe' => $this->safeMode, |
| 141 | 141 | 'globals' => array( |
| 142 | - array('name' => 'site', 'value' => $this->getConfiguration()->getConfiguration()), |
|
| 142 | + array('name' => 'site', 'value' => $this->getConfiguration()->getConfiguration()), |
|
| 143 | 143 | array('name' => 'collections', 'value' => $this->cm->getJailedCollections()), |
| 144 | - array('name' => 'menu', 'value' => $this->pm->getSiteMenu()), |
|
| 145 | - array('name' => 'pages', 'value' => $this->pm->getFlatPages()), |
|
| 146 | - array('name' => 'data', 'value' => $this->dm->getDataItems()) |
|
| 144 | + array('name' => 'menu', 'value' => $this->pm->getSiteMenu()), |
|
| 145 | + array('name' => 'pages', 'value' => $this->pm->getFlatPages()), |
|
| 146 | + array('name' => 'data', 'value' => $this->dm->getDataItems()) |
|
| 147 | 147 | ) |
| 148 | 148 | )); |
| 149 | 149 | $this->pm->compileAll(); |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | /** |
| 310 | 310 | * @return boolean |
| 311 | 311 | */ |
| 312 | - public function isNoClean() |
|
| 312 | + public function isNoClean () |
|
| 313 | 313 | { |
| 314 | 314 | return $this->noClean; |
| 315 | 315 | } |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | /** |
| 318 | 318 | * @param boolean $noClean |
| 319 | 319 | */ |
| 320 | - public function setNoClean($noClean) |
|
| 320 | + public function setNoClean ($noClean) |
|
| 321 | 321 | { |
| 322 | 322 | $this->noClean = $noClean; |
| 323 | 323 | } |
@@ -63,8 +63,8 @@ |
||
| 63 | 63 | * FileExplorer constructor. |
| 64 | 64 | * |
| 65 | 65 | * @param \RecursiveIterator $iterator |
| 66 | - * @param array $excludes |
|
| 67 | - * @param array $includes |
|
| 66 | + * @param string[] $excludes |
|
| 67 | + * @param string[] $includes |
|
| 68 | 68 | * @param int|null $flags |
| 69 | 69 | */ |
| 70 | 70 | public function __construct(\RecursiveIterator $iterator, array $excludes = array(), array $includes = array(), $flags = null) |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * A bitwise flag to have FileExplorer search files starting with a period as well |
| 22 | 22 | */ |
| 23 | - const ALLOW_DOT_FILES = 0x2; |
|
| 23 | + const ALLOW_DOT_FILES = 0x2; |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * A list of common version control folders to ignore. |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | * |
| 37 | 37 | * @var string[] |
| 38 | 38 | */ |
| 39 | - public static $vcsPatterns = array('.git', '.hg', '.svn', '_svn'); |
|
| 39 | + public static $vcsPatterns = array('.git', '.hg', '.svn', '_svn'); |
|
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * A list of phrases to exclude from the search |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @param array $includes |
| 68 | 68 | * @param int|null $flags |
| 69 | 69 | */ |
| 70 | - public function __construct(\RecursiveIterator $iterator, array $excludes = array(), array $includes = array(), $flags = null) |
|
| 70 | + public function __construct (\RecursiveIterator $iterator, array $excludes = array(), array $includes = array(), $flags = null) |
|
| 71 | 71 | { |
| 72 | 72 | parent::__construct($iterator); |
| 73 | 73 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | /** |
| 80 | 80 | * @return string |
| 81 | 81 | */ |
| 82 | - public function __toString() |
|
| 82 | + public function __toString () |
|
| 83 | 83 | { |
| 84 | 84 | return $this->current()->getFilename(); |
| 85 | 85 | } |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | * |
| 106 | 106 | * @return SplFileInfo |
| 107 | 107 | */ |
| 108 | - public function current() |
|
| 108 | + public function current () |
|
| 109 | 109 | { |
| 110 | 110 | /** @var \SplFileInfo $current */ |
| 111 | 111 | $current = parent::current(); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | /** |
| 121 | 121 | * {@inheritdoc} |
| 122 | 122 | */ |
| 123 | - public function getChildren() |
|
| 123 | + public function getChildren () |
|
| 124 | 124 | { |
| 125 | 125 | return (new self( |
| 126 | 126 | $this->getInnerIterator()->getChildren(), |
@@ -143,11 +143,17 @@ discard block |
||
| 143 | 143 | */ |
| 144 | 144 | public function matchesPattern ($filePath) |
| 145 | 145 | { |
| 146 | - if ($this->strpos_array($filePath, $this->includes)) { return true; } |
|
| 147 | - if (($this->flags & self::INCLUDE_ONLY_FILES) && !$this->current()->isDir()) { return false; } |
|
| 146 | + if ($this->strpos_array($filePath, $this->includes)) |
|
| 147 | + { |
|
| 148 | +return true; } |
|
| 149 | + if (($this->flags & self::INCLUDE_ONLY_FILES) && !$this->current()->isDir()) |
|
| 150 | + { |
|
| 151 | +return false; } |
|
| 148 | 152 | |
| 149 | 153 | if (!($this->flags & self::ALLOW_DOT_FILES) && |
| 150 | - preg_match('#(^|\\\\|\/)\..+(\\\\|\/|$)#', $filePath) === 1) { return false; } |
|
| 154 | + preg_match('#(^|\\\\|\/)\..+(\\\\|\/|$)#', $filePath) === 1) |
|
| 155 | + { |
|
| 156 | +return false; } |
|
| 151 | 157 | |
| 152 | 158 | return ($this->strpos_array($filePath, $this->excludes) === false); |
| 153 | 159 | } |
@@ -192,10 +198,13 @@ discard block |
||
| 192 | 198 | return true; |
| 193 | 199 | } |
| 194 | 200 | |
| 195 | - if (strpos($haystack, $query, $offset) !== false) // stop on first true result |
|
| 201 | + if (strpos($haystack, $query, $offset) !== false) |
|
| 202 | + { |
|
| 203 | + // stop on first true result |
|
| 196 | 204 | { |
| 197 | 205 | return true; |
| 198 | 206 | } |
| 207 | + } |
|
| 199 | 208 | } |
| 200 | 209 | |
| 201 | 210 | return false; |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | /** |
| 16 | 16 | * Returns a list of filters. |
| 17 | 17 | * |
| 18 | - * @return array |
|
| 18 | + * @return Twig_SimpleFilter[] |
|
| 19 | 19 | */ |
| 20 | 20 | public function getFilters () |
| 21 | 21 | { |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | public function getFilters () |
| 21 | 21 | { |
| 22 | 22 | return array( |
| 23 | - new Twig_SimpleFilter('summary', 'twig_summary_filter'), |
|
| 23 | + new Twig_SimpleFilter('summary', 'twig_summary_filter'), |
|
| 24 | 24 | new Twig_SimpleFilter('truncate', 'twig_truncate_filter', array('needs_environment' => true)), |
| 25 | 25 | new Twig_SimpleFilter('wordwrap', 'twig_wordwrap_filter', array('needs_environment' => true)), |
| 26 | 26 | ); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | $length = $breakpoint; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - return rtrim(mb_substr($value, 0, $length, $env->getCharset())).$separator; |
|
| 76 | + return rtrim(mb_substr($value, 0, $length, $env->getCharset())) . $separator; |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | return $value; |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | /** |
| 104 | 104 | * {@inheritdoc} |
| 105 | 105 | */ |
| 106 | - public function offsetExists($offset) |
|
| 106 | + public function offsetExists ($offset) |
|
| 107 | 107 | { |
| 108 | 108 | return $this->object->offsetExists($offset); |
| 109 | 109 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | /** |
| 112 | 112 | * {@inheritdoc} |
| 113 | 113 | */ |
| 114 | - public function offsetGet($offset) |
|
| 114 | + public function offsetGet ($offset) |
|
| 115 | 115 | { |
| 116 | 116 | return $this->object->offsetGet($offset); |
| 117 | 117 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | /** |
| 120 | 120 | * {@inheritdoc} |
| 121 | 121 | */ |
| 122 | - public function offsetSet($offset, $value) |
|
| 122 | + public function offsetSet ($offset, $value) |
|
| 123 | 123 | { |
| 124 | 124 | return $this->object->offsetSet($offset, $value); |
| 125 | 125 | } |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | /** |
| 128 | 128 | * {@inheritdoc} |
| 129 | 129 | */ |
| 130 | - public function offsetUnset($offset) |
|
| 130 | + public function offsetUnset ($offset) |
|
| 131 | 131 | { |
| 132 | 132 | return $this->object->offsetUnset($offset); |
| 133 | 133 | } |