Tim Starling has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342562 )
Change subject: Basic PHPLint support ...................................................................... Basic PHPLint support Move src to a directory named after the namespace RemexHtml, to support PHPLint's idea of autoloading. Ran PHPLint 3.0 and fixed a few minor issues. There are still many, many errors, and it's not a goal to fix them. But I was able to verify that there are no unintentional missing breaks, or variables accessed before their assignment. Change-Id: Icb269d934a80bdfe0332c0003c854bffdc58eb71 --- R RemexHtml/DOM/DOMBuilder.php R RemexHtml/DOM/DOMFormatter.php R RemexHtml/DOM/DOMSerializer.php R RemexHtml/DOM/DOMUtils.php R RemexHtml/FuzzTest/CharacterSalad.php R RemexHtml/FuzzTest/FuzzData.php R RemexHtml/FuzzTest/FuzzTest.php R RemexHtml/FuzzTest/Html5Depurate.php R RemexHtml/FuzzTest/TokenSalad.php R RemexHtml/FuzzTest/Utils.php R RemexHtml/FuzzTest/validatornu-dictionary R RemexHtml/GenerateDataFiles.php R RemexHtml/HTMLData.php R RemexHtml/PropGuard.php R RemexHtml/Serializer/AbstractSerializer.php R RemexHtml/Serializer/DepurateFormatter.php R RemexHtml/Serializer/FastFormatter.php R RemexHtml/Serializer/Formatter.php R RemexHtml/Serializer/HtmlFormatter.php R RemexHtml/Serializer/Serializer.php R RemexHtml/Serializer/SerializerError.php R RemexHtml/Serializer/SerializerNode.php R RemexHtml/Serializer/TestFormatter.php R RemexHtml/Tokenizer/Attribute.php R RemexHtml/Tokenizer/Attributes.php R RemexHtml/Tokenizer/LazyAttributes.php R RemexHtml/Tokenizer/PlainAttributes.php R RemexHtml/Tokenizer/TestTokenHandler.php R RemexHtml/Tokenizer/TokenGenerator.php R RemexHtml/Tokenizer/TokenGeneratorHandler.php R RemexHtml/Tokenizer/TokenHandler.php R RemexHtml/Tokenizer/TokenSerializer.php R RemexHtml/Tokenizer/Tokenizer.php R RemexHtml/Tokenizer/TokenizerError.php R RemexHtml/TreeBuilder/ActiveFormattingElements.php R RemexHtml/TreeBuilder/AfterAfterBody.php R RemexHtml/TreeBuilder/AfterAfterFrameset.php R RemexHtml/TreeBuilder/AfterBody.php R RemexHtml/TreeBuilder/AfterFrameset.php R RemexHtml/TreeBuilder/AfterHead.php R RemexHtml/TreeBuilder/BeforeHead.php R RemexHtml/TreeBuilder/BeforeHtml.php R RemexHtml/TreeBuilder/CachingStack.php R RemexHtml/TreeBuilder/DestructTracer.php R RemexHtml/TreeBuilder/DestructTracerNode.php R RemexHtml/TreeBuilder/DispatchTracer.php R RemexHtml/TreeBuilder/Dispatcher.php R RemexHtml/TreeBuilder/Element.php R RemexHtml/TreeBuilder/ForeignAttributes.php R RemexHtml/TreeBuilder/FormattingElement.php R RemexHtml/TreeBuilder/InBody.php R RemexHtml/TreeBuilder/InCaption.php R RemexHtml/TreeBuilder/InCell.php R RemexHtml/TreeBuilder/InColumnGroup.php R RemexHtml/TreeBuilder/InForeignContent.php R RemexHtml/TreeBuilder/InFrameset.php R RemexHtml/TreeBuilder/InHead.php R RemexHtml/TreeBuilder/InHeadNoscript.php R RemexHtml/TreeBuilder/InPre.php R RemexHtml/TreeBuilder/InRow.php R RemexHtml/TreeBuilder/InSelect.php R RemexHtml/TreeBuilder/InSelectInTable.php R RemexHtml/TreeBuilder/InTable.php R RemexHtml/TreeBuilder/InTableBody.php R RemexHtml/TreeBuilder/InTableText.php R RemexHtml/TreeBuilder/InTemplate.php R RemexHtml/TreeBuilder/InTextarea.php R RemexHtml/TreeBuilder/Initial.php R RemexHtml/TreeBuilder/InsertionMode.php R RemexHtml/TreeBuilder/Marker.php R RemexHtml/TreeBuilder/SimpleStack.php R RemexHtml/TreeBuilder/Stack.php R RemexHtml/TreeBuilder/TemplateModeStack.php R RemexHtml/TreeBuilder/Text.php R RemexHtml/TreeBuilder/TreeBuilder.php R RemexHtml/TreeBuilder/TreeBuilderError.php R RemexHtml/TreeBuilder/TreeHandler.php R RemexHtml/TreeBuilder/TreeMutationTracer.php M composer.json A tests/phplint/autoload.php A tests/phplint/phplint 81 files changed, 45 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml refs/changes/62/342562/1 diff --git a/src/DOM/DOMBuilder.php b/RemexHtml/DOM/DOMBuilder.php similarity index 100% rename from src/DOM/DOMBuilder.php rename to RemexHtml/DOM/DOMBuilder.php diff --git a/src/DOM/DOMFormatter.php b/RemexHtml/DOM/DOMFormatter.php similarity index 87% rename from src/DOM/DOMFormatter.php rename to RemexHtml/DOM/DOMFormatter.php index dad8a7d..2a84f0e 100644 --- a/src/DOM/DOMFormatter.php +++ b/RemexHtml/DOM/DOMFormatter.php @@ -14,7 +14,7 @@ /** * Non-recursively format a DOMElement. * - * @param DOMElement $Element The element to format + * @param DOMElement $element The element to format * @param string $contents The formatted contents of the element */ function formatDOMElement( \DOMElement $element, $contents ); diff --git a/src/DOM/DOMSerializer.php b/RemexHtml/DOM/DOMSerializer.php similarity index 100% rename from src/DOM/DOMSerializer.php rename to RemexHtml/DOM/DOMSerializer.php diff --git a/src/DOM/DOMUtils.php b/RemexHtml/DOM/DOMUtils.php similarity index 100% rename from src/DOM/DOMUtils.php rename to RemexHtml/DOM/DOMUtils.php diff --git a/src/FuzzTest/CharacterSalad.php b/RemexHtml/FuzzTest/CharacterSalad.php similarity index 100% rename from src/FuzzTest/CharacterSalad.php rename to RemexHtml/FuzzTest/CharacterSalad.php diff --git a/src/FuzzTest/FuzzData.php b/RemexHtml/FuzzTest/FuzzData.php similarity index 100% rename from src/FuzzTest/FuzzData.php rename to RemexHtml/FuzzTest/FuzzData.php diff --git a/src/FuzzTest/FuzzTest.php b/RemexHtml/FuzzTest/FuzzTest.php similarity index 100% rename from src/FuzzTest/FuzzTest.php rename to RemexHtml/FuzzTest/FuzzTest.php diff --git a/src/FuzzTest/Html5Depurate.php b/RemexHtml/FuzzTest/Html5Depurate.php similarity index 100% rename from src/FuzzTest/Html5Depurate.php rename to RemexHtml/FuzzTest/Html5Depurate.php diff --git a/src/FuzzTest/TokenSalad.php b/RemexHtml/FuzzTest/TokenSalad.php similarity index 100% rename from src/FuzzTest/TokenSalad.php rename to RemexHtml/FuzzTest/TokenSalad.php diff --git a/src/FuzzTest/Utils.php b/RemexHtml/FuzzTest/Utils.php similarity index 100% rename from src/FuzzTest/Utils.php rename to RemexHtml/FuzzTest/Utils.php diff --git a/src/FuzzTest/validatornu-dictionary b/RemexHtml/FuzzTest/validatornu-dictionary similarity index 100% rename from src/FuzzTest/validatornu-dictionary rename to RemexHtml/FuzzTest/validatornu-dictionary diff --git a/src/GenerateDataFiles.php b/RemexHtml/GenerateDataFiles.php similarity index 100% rename from src/GenerateDataFiles.php rename to RemexHtml/GenerateDataFiles.php diff --git a/src/HTMLData.php b/RemexHtml/HTMLData.php similarity index 100% rename from src/HTMLData.php rename to RemexHtml/HTMLData.php diff --git a/src/PropGuard.php b/RemexHtml/PropGuard.php similarity index 100% rename from src/PropGuard.php rename to RemexHtml/PropGuard.php diff --git a/src/Serializer/AbstractSerializer.php b/RemexHtml/Serializer/AbstractSerializer.php similarity index 100% rename from src/Serializer/AbstractSerializer.php rename to RemexHtml/Serializer/AbstractSerializer.php diff --git a/src/Serializer/DepurateFormatter.php b/RemexHtml/Serializer/DepurateFormatter.php similarity index 100% rename from src/Serializer/DepurateFormatter.php rename to RemexHtml/Serializer/DepurateFormatter.php diff --git a/src/Serializer/FastFormatter.php b/RemexHtml/Serializer/FastFormatter.php similarity index 100% rename from src/Serializer/FastFormatter.php rename to RemexHtml/Serializer/FastFormatter.php diff --git a/src/Serializer/Formatter.php b/RemexHtml/Serializer/Formatter.php similarity index 100% rename from src/Serializer/Formatter.php rename to RemexHtml/Serializer/Formatter.php diff --git a/src/Serializer/HtmlFormatter.php b/RemexHtml/Serializer/HtmlFormatter.php similarity index 100% rename from src/Serializer/HtmlFormatter.php rename to RemexHtml/Serializer/HtmlFormatter.php diff --git a/src/Serializer/Serializer.php b/RemexHtml/Serializer/Serializer.php similarity index 100% rename from src/Serializer/Serializer.php rename to RemexHtml/Serializer/Serializer.php diff --git a/src/Serializer/SerializerError.php b/RemexHtml/Serializer/SerializerError.php similarity index 100% rename from src/Serializer/SerializerError.php rename to RemexHtml/Serializer/SerializerError.php diff --git a/src/Serializer/SerializerNode.php b/RemexHtml/Serializer/SerializerNode.php similarity index 100% rename from src/Serializer/SerializerNode.php rename to RemexHtml/Serializer/SerializerNode.php diff --git a/src/Serializer/TestFormatter.php b/RemexHtml/Serializer/TestFormatter.php similarity index 100% rename from src/Serializer/TestFormatter.php rename to RemexHtml/Serializer/TestFormatter.php diff --git a/src/Tokenizer/Attribute.php b/RemexHtml/Tokenizer/Attribute.php similarity index 100% rename from src/Tokenizer/Attribute.php rename to RemexHtml/Tokenizer/Attribute.php diff --git a/src/Tokenizer/Attributes.php b/RemexHtml/Tokenizer/Attributes.php similarity index 100% rename from src/Tokenizer/Attributes.php rename to RemexHtml/Tokenizer/Attributes.php diff --git a/src/Tokenizer/LazyAttributes.php b/RemexHtml/Tokenizer/LazyAttributes.php similarity index 100% rename from src/Tokenizer/LazyAttributes.php rename to RemexHtml/Tokenizer/LazyAttributes.php diff --git a/src/Tokenizer/PlainAttributes.php b/RemexHtml/Tokenizer/PlainAttributes.php similarity index 100% rename from src/Tokenizer/PlainAttributes.php rename to RemexHtml/Tokenizer/PlainAttributes.php diff --git a/src/Tokenizer/TestTokenHandler.php b/RemexHtml/Tokenizer/TestTokenHandler.php similarity index 100% rename from src/Tokenizer/TestTokenHandler.php rename to RemexHtml/Tokenizer/TestTokenHandler.php diff --git a/src/Tokenizer/TokenGenerator.php b/RemexHtml/Tokenizer/TokenGenerator.php similarity index 100% rename from src/Tokenizer/TokenGenerator.php rename to RemexHtml/Tokenizer/TokenGenerator.php diff --git a/src/Tokenizer/TokenGeneratorHandler.php b/RemexHtml/Tokenizer/TokenGeneratorHandler.php similarity index 100% rename from src/Tokenizer/TokenGeneratorHandler.php rename to RemexHtml/Tokenizer/TokenGeneratorHandler.php diff --git a/src/Tokenizer/TokenHandler.php b/RemexHtml/Tokenizer/TokenHandler.php similarity index 100% rename from src/Tokenizer/TokenHandler.php rename to RemexHtml/Tokenizer/TokenHandler.php diff --git a/src/Tokenizer/TokenSerializer.php b/RemexHtml/Tokenizer/TokenSerializer.php similarity index 100% rename from src/Tokenizer/TokenSerializer.php rename to RemexHtml/Tokenizer/TokenSerializer.php diff --git a/src/Tokenizer/Tokenizer.php b/RemexHtml/Tokenizer/Tokenizer.php similarity index 98% rename from src/Tokenizer/Tokenizer.php rename to RemexHtml/Tokenizer/Tokenizer.php index 0d84b15..3cf3540 100644 --- a/src/Tokenizer/Tokenizer.php +++ b/RemexHtml/Tokenizer/Tokenizer.php @@ -232,8 +232,8 @@ * Tokenize a minimum amount of text from the input stream, and emit the * resulting events. * - * @return True if the input continues and step() should be called again, - * false on EOF + * @return bool True if the input continues and step() should be called + * again, false on EOF */ public function step() { if ( $this->state === null ) { @@ -299,7 +299,7 @@ /** * The main state machine, the common implementation of step() and execute(). * @param bool $loop Set to true to loop until finished, false to step once. - * @return True if the input continues, false on EOF + * @return bool True if the input continues, false on EOF */ protected function executeInternal( $loop ) { $eof = false; @@ -348,7 +348,7 @@ * * @param bool $loop True to loop while still in the data state, false to * process a single less-than sign. - * @return The next state index + * @return integer The next state index */ protected function dataState( $loop ) { $re = "~ < @@ -373,9 +373,9 @@ (?: (?! --> ) (?! --!> ) - (?! --! \z ) - (?! -- \z ) - (?! - \z ) + (?! --! \\z ) + (?! -- \\z ) + (?! - \\z ) . )*+ ) @@ -744,7 +744,7 @@ * @param string $text The text to be converted * @param integer $sourcePos The input byte offset from which $text was * extracted, for error position reporting. - * @return The converted text + * @return string The converted text */ protected function handleNulls( $text, $sourcePos ) { if ( $this->ignoreNulls ) { @@ -808,7 +808,7 @@ * @param string $additionalAllowedChar An unused string which the spec * inexplicably spends a lot of space telling you how to derive. It * suppresses errors in a place where no errors are emitted anyway. - * @return The expanded text + * @return string The expanded text */ protected function handleCharRefs( $text, $sourcePos, $inAttr = false, $additionalAllowedChar = '' @@ -1107,7 +1107,7 @@ * - @todo: Measure performance improvement, assess whether the LazyAttributes * feature is warranted. * - * @return Attributes + * @return array Attributes */ protected function consumeAttribs() { $re = '~ diff --git a/src/Tokenizer/TokenizerError.php b/RemexHtml/Tokenizer/TokenizerError.php similarity index 100% rename from src/Tokenizer/TokenizerError.php rename to RemexHtml/Tokenizer/TokenizerError.php diff --git a/src/TreeBuilder/ActiveFormattingElements.php b/RemexHtml/TreeBuilder/ActiveFormattingElements.php similarity index 100% rename from src/TreeBuilder/ActiveFormattingElements.php rename to RemexHtml/TreeBuilder/ActiveFormattingElements.php diff --git a/src/TreeBuilder/AfterAfterBody.php b/RemexHtml/TreeBuilder/AfterAfterBody.php similarity index 100% rename from src/TreeBuilder/AfterAfterBody.php rename to RemexHtml/TreeBuilder/AfterAfterBody.php diff --git a/src/TreeBuilder/AfterAfterFrameset.php b/RemexHtml/TreeBuilder/AfterAfterFrameset.php similarity index 100% rename from src/TreeBuilder/AfterAfterFrameset.php rename to RemexHtml/TreeBuilder/AfterAfterFrameset.php diff --git a/src/TreeBuilder/AfterBody.php b/RemexHtml/TreeBuilder/AfterBody.php similarity index 100% rename from src/TreeBuilder/AfterBody.php rename to RemexHtml/TreeBuilder/AfterBody.php diff --git a/src/TreeBuilder/AfterFrameset.php b/RemexHtml/TreeBuilder/AfterFrameset.php similarity index 100% rename from src/TreeBuilder/AfterFrameset.php rename to RemexHtml/TreeBuilder/AfterFrameset.php diff --git a/src/TreeBuilder/AfterHead.php b/RemexHtml/TreeBuilder/AfterHead.php similarity index 100% rename from src/TreeBuilder/AfterHead.php rename to RemexHtml/TreeBuilder/AfterHead.php diff --git a/src/TreeBuilder/BeforeHead.php b/RemexHtml/TreeBuilder/BeforeHead.php similarity index 100% rename from src/TreeBuilder/BeforeHead.php rename to RemexHtml/TreeBuilder/BeforeHead.php diff --git a/src/TreeBuilder/BeforeHtml.php b/RemexHtml/TreeBuilder/BeforeHtml.php similarity index 100% rename from src/TreeBuilder/BeforeHtml.php rename to RemexHtml/TreeBuilder/BeforeHtml.php diff --git a/src/TreeBuilder/CachingStack.php b/RemexHtml/TreeBuilder/CachingStack.php similarity index 100% rename from src/TreeBuilder/CachingStack.php rename to RemexHtml/TreeBuilder/CachingStack.php diff --git a/src/TreeBuilder/DestructTracer.php b/RemexHtml/TreeBuilder/DestructTracer.php similarity index 100% rename from src/TreeBuilder/DestructTracer.php rename to RemexHtml/TreeBuilder/DestructTracer.php diff --git a/src/TreeBuilder/DestructTracerNode.php b/RemexHtml/TreeBuilder/DestructTracerNode.php similarity index 100% rename from src/TreeBuilder/DestructTracerNode.php rename to RemexHtml/TreeBuilder/DestructTracerNode.php diff --git a/src/TreeBuilder/DispatchTracer.php b/RemexHtml/TreeBuilder/DispatchTracer.php similarity index 100% rename from src/TreeBuilder/DispatchTracer.php rename to RemexHtml/TreeBuilder/DispatchTracer.php diff --git a/src/TreeBuilder/Dispatcher.php b/RemexHtml/TreeBuilder/Dispatcher.php similarity index 100% rename from src/TreeBuilder/Dispatcher.php rename to RemexHtml/TreeBuilder/Dispatcher.php diff --git a/src/TreeBuilder/Element.php b/RemexHtml/TreeBuilder/Element.php similarity index 100% rename from src/TreeBuilder/Element.php rename to RemexHtml/TreeBuilder/Element.php diff --git a/src/TreeBuilder/ForeignAttributes.php b/RemexHtml/TreeBuilder/ForeignAttributes.php similarity index 100% rename from src/TreeBuilder/ForeignAttributes.php rename to RemexHtml/TreeBuilder/ForeignAttributes.php diff --git a/src/TreeBuilder/FormattingElement.php b/RemexHtml/TreeBuilder/FormattingElement.php similarity index 100% rename from src/TreeBuilder/FormattingElement.php rename to RemexHtml/TreeBuilder/FormattingElement.php diff --git a/src/TreeBuilder/InBody.php b/RemexHtml/TreeBuilder/InBody.php similarity index 100% rename from src/TreeBuilder/InBody.php rename to RemexHtml/TreeBuilder/InBody.php diff --git a/src/TreeBuilder/InCaption.php b/RemexHtml/TreeBuilder/InCaption.php similarity index 100% rename from src/TreeBuilder/InCaption.php rename to RemexHtml/TreeBuilder/InCaption.php diff --git a/src/TreeBuilder/InCell.php b/RemexHtml/TreeBuilder/InCell.php similarity index 100% rename from src/TreeBuilder/InCell.php rename to RemexHtml/TreeBuilder/InCell.php diff --git a/src/TreeBuilder/InColumnGroup.php b/RemexHtml/TreeBuilder/InColumnGroup.php similarity index 100% rename from src/TreeBuilder/InColumnGroup.php rename to RemexHtml/TreeBuilder/InColumnGroup.php diff --git a/src/TreeBuilder/InForeignContent.php b/RemexHtml/TreeBuilder/InForeignContent.php similarity index 100% rename from src/TreeBuilder/InForeignContent.php rename to RemexHtml/TreeBuilder/InForeignContent.php diff --git a/src/TreeBuilder/InFrameset.php b/RemexHtml/TreeBuilder/InFrameset.php similarity index 100% rename from src/TreeBuilder/InFrameset.php rename to RemexHtml/TreeBuilder/InFrameset.php diff --git a/src/TreeBuilder/InHead.php b/RemexHtml/TreeBuilder/InHead.php similarity index 99% rename from src/TreeBuilder/InHead.php rename to RemexHtml/TreeBuilder/InHead.php index bf13191..dc1efb7 100644 --- a/src/TreeBuilder/InHead.php +++ b/RemexHtml/TreeBuilder/InHead.php @@ -71,7 +71,7 @@ $mode = Dispatcher::IN_HEAD_NOSCRIPT; break; } - // Fall through + /*. missing_break; .*/ case 'noframes': case 'style': $tokenizerState = Tokenizer::STATE_RAWTEXT; diff --git a/src/TreeBuilder/InHeadNoscript.php b/RemexHtml/TreeBuilder/InHeadNoscript.php similarity index 100% rename from src/TreeBuilder/InHeadNoscript.php rename to RemexHtml/TreeBuilder/InHeadNoscript.php diff --git a/src/TreeBuilder/InPre.php b/RemexHtml/TreeBuilder/InPre.php similarity index 100% rename from src/TreeBuilder/InPre.php rename to RemexHtml/TreeBuilder/InPre.php diff --git a/src/TreeBuilder/InRow.php b/RemexHtml/TreeBuilder/InRow.php similarity index 100% rename from src/TreeBuilder/InRow.php rename to RemexHtml/TreeBuilder/InRow.php diff --git a/src/TreeBuilder/InSelect.php b/RemexHtml/TreeBuilder/InSelect.php similarity index 100% rename from src/TreeBuilder/InSelect.php rename to RemexHtml/TreeBuilder/InSelect.php diff --git a/src/TreeBuilder/InSelectInTable.php b/RemexHtml/TreeBuilder/InSelectInTable.php similarity index 100% rename from src/TreeBuilder/InSelectInTable.php rename to RemexHtml/TreeBuilder/InSelectInTable.php diff --git a/src/TreeBuilder/InTable.php b/RemexHtml/TreeBuilder/InTable.php similarity index 100% rename from src/TreeBuilder/InTable.php rename to RemexHtml/TreeBuilder/InTable.php diff --git a/src/TreeBuilder/InTableBody.php b/RemexHtml/TreeBuilder/InTableBody.php similarity index 100% rename from src/TreeBuilder/InTableBody.php rename to RemexHtml/TreeBuilder/InTableBody.php diff --git a/src/TreeBuilder/InTableText.php b/RemexHtml/TreeBuilder/InTableText.php similarity index 100% rename from src/TreeBuilder/InTableText.php rename to RemexHtml/TreeBuilder/InTableText.php diff --git a/src/TreeBuilder/InTemplate.php b/RemexHtml/TreeBuilder/InTemplate.php similarity index 100% rename from src/TreeBuilder/InTemplate.php rename to RemexHtml/TreeBuilder/InTemplate.php diff --git a/src/TreeBuilder/InTextarea.php b/RemexHtml/TreeBuilder/InTextarea.php similarity index 100% rename from src/TreeBuilder/InTextarea.php rename to RemexHtml/TreeBuilder/InTextarea.php diff --git a/src/TreeBuilder/Initial.php b/RemexHtml/TreeBuilder/Initial.php similarity index 100% rename from src/TreeBuilder/Initial.php rename to RemexHtml/TreeBuilder/Initial.php diff --git a/src/TreeBuilder/InsertionMode.php b/RemexHtml/TreeBuilder/InsertionMode.php similarity index 100% rename from src/TreeBuilder/InsertionMode.php rename to RemexHtml/TreeBuilder/InsertionMode.php diff --git a/src/TreeBuilder/Marker.php b/RemexHtml/TreeBuilder/Marker.php similarity index 100% rename from src/TreeBuilder/Marker.php rename to RemexHtml/TreeBuilder/Marker.php diff --git a/src/TreeBuilder/SimpleStack.php b/RemexHtml/TreeBuilder/SimpleStack.php similarity index 100% rename from src/TreeBuilder/SimpleStack.php rename to RemexHtml/TreeBuilder/SimpleStack.php diff --git a/src/TreeBuilder/Stack.php b/RemexHtml/TreeBuilder/Stack.php similarity index 96% rename from src/TreeBuilder/Stack.php rename to RemexHtml/TreeBuilder/Stack.php index f2ee866..b0a976b 100644 --- a/src/TreeBuilder/Stack.php +++ b/RemexHtml/TreeBuilder/Stack.php @@ -62,8 +62,8 @@ * Is there any element in the (default) scope which is in the HTML * namespace and has one of the given tag names? * - * @param string[bool] An array with the tag names in the keys, the value - * arbitrary + * @param string[bool] $names An array with the tag names in the keys, the + * value arbitrary * @return bool */ abstract public function isOneOfSetInScope( $names ); diff --git a/src/TreeBuilder/TemplateModeStack.php b/RemexHtml/TreeBuilder/TemplateModeStack.php similarity index 100% rename from src/TreeBuilder/TemplateModeStack.php rename to RemexHtml/TreeBuilder/TemplateModeStack.php diff --git a/src/TreeBuilder/Text.php b/RemexHtml/TreeBuilder/Text.php similarity index 100% rename from src/TreeBuilder/Text.php rename to RemexHtml/TreeBuilder/Text.php diff --git a/src/TreeBuilder/TreeBuilder.php b/RemexHtml/TreeBuilder/TreeBuilder.php similarity index 100% rename from src/TreeBuilder/TreeBuilder.php rename to RemexHtml/TreeBuilder/TreeBuilder.php diff --git a/src/TreeBuilder/TreeBuilderError.php b/RemexHtml/TreeBuilder/TreeBuilderError.php similarity index 100% rename from src/TreeBuilder/TreeBuilderError.php rename to RemexHtml/TreeBuilder/TreeBuilderError.php diff --git a/src/TreeBuilder/TreeHandler.php b/RemexHtml/TreeBuilder/TreeHandler.php similarity index 98% rename from src/TreeBuilder/TreeHandler.php rename to RemexHtml/TreeBuilder/TreeHandler.php index f56e804..8ad34dc 100644 --- a/src/TreeBuilder/TreeHandler.php +++ b/RemexHtml/TreeBuilder/TreeHandler.php @@ -139,7 +139,7 @@ /** * Remove a node from the tree, and all its children. This is only done - * when a <framset> element is found, which triggers removal of the + * when a <frameset> element is found, which triggers removal of the * partially-constructed body element. * * @param Element $element The element to remove diff --git a/src/TreeBuilder/TreeMutationTracer.php b/RemexHtml/TreeBuilder/TreeMutationTracer.php similarity index 100% rename from src/TreeBuilder/TreeMutationTracer.php rename to RemexHtml/TreeBuilder/TreeMutationTracer.php diff --git a/composer.json b/composer.json index 48f0d45..95f78cc 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ }, "autoload": { "psr-4": { - "RemexHtml\\": "src/" + "RemexHtml\\": "RemexHtml/" } }, "scripts": { diff --git a/tests/phplint/autoload.php b/tests/phplint/autoload.php new file mode 100644 index 0000000..16f9069 --- /dev/null +++ b/tests/phplint/autoload.php @@ -0,0 +1,21 @@ +<?php + +/* + * PHPLint fake entry point + */ +/*. + +require_module 'array'; +require_module 'core'; +require_module 'file'; +require_module 'pcre'; +require_module 'spl'; + +.*/ + +function __autoload(/*. string .*/ $className) { + /*. pragma 'autoload' 'schema1' '../..' '/' '.php'; .*/ + require_once '../../' . + str_replace( '\\', '/', $className ) . '.php'; +} + diff --git a/tests/phplint/phplint b/tests/phplint/phplint new file mode 100755 index 0000000..a0dd856 --- /dev/null +++ b/tests/phplint/phplint @@ -0,0 +1,8 @@ +#!/bin/bash + +base=$(readlink -f $(dirname $0)/../..) +files=$(find "$base/RemexHtml" -name \*.php) + +phpl --no-ascii-ext-check --no-ctrl-check --no-print-context \ + "$@" "$base/tests/phplint/autoload.php" $files \ + | egrep -v 'ERROR: undefined type |^==== [0-9]*:|^[0-9]*:|ERROR: multiple types not supported' -- To view, visit https://gerrit.wikimedia.org/r/342562 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb269d934a80bdfe0332c0003c854bffdc58eb71 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/libs/RemexHtml Gerrit-Branch: master Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits