diff --git a/.gitignore b/.gitignore index d5e33e7..9c51757 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/.phpcs-cache +/.phpunit.result.cache /clover.xml /composer.lock /coveralls-upload.json diff --git a/.phpcs-cache b/.phpcs-cache new file mode 100644 index 0000000..d0a4960 --- /dev/null +++ b/.phpcs-cache @@ -0,0 +1 @@ +{"config":{"phpVersion":70410,"phpExtensions":"9c63694ea9ed34ee2d20652c0c467e69","tabWidth":4,"encoding":"utf-8","recordErrors":true,"annotations":true,"configData":{"installed_paths":"..\/..\/webimpress,..\/..\/laminas\/laminas-coding-standard\/src,..\/..\/webimpress\/coding-standard\/src,..\/..\/slevomat\/coding-standard"},"codeHash":"ec1baa83703132347806c3154cb88c9f","rulesetHash":"6437dc4eda23e7c26f5f667da4f4ba90"},"\/home\/geert\/geerteltink\/mezzio-template\/src\/Exception\/RenderingException.php":{"hash":"2a68c56f8456ca25c53dba668a2d4c1433188","errors":[],"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":10,"81-120":2}},"PHP keyword case":{"values":{"lower":6}},"Multiple statements on same line":{"values":{"no":3}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}}},"errorCount":0,"warningCount":0,"fixableCount":0,"numTokens":70},"\/home\/geert\/geerteltink\/mezzio-template\/src\/Exception\/InvalidArgumentException.php":{"hash":"4a125d56da891aab932d43438edd2c2c33188","errors":[],"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":9,"81-120":3}},"PHP keyword case":{"values":{"lower":7}},"Multiple statements on same line":{"values":{"no":3}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}}},"errorCount":0,"warningCount":0,"fixableCount":0,"numTokens":74},"\/home\/geert\/geerteltink\/mezzio-template\/src\/Exception\/ExceptionInterface.php":{"hash":"cc75db1b13c12599d1067fbd17c2f3cb33188","errors":[],"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":9,"81-120":2}},"PHP keyword case":{"values":{"lower":3}},"Multiple statements on same line":{"values":{"no":2}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}}},"errorCount":0,"warningCount":0,"fixableCount":0,"numTokens":56},"\/home\/geert\/geerteltink\/mezzio-template\/src\/TemplatePath.php":{"hash":"0b3b68e68ddddddaa18370ba2a80edbf33188","errors":{"21":{"12":[{"message":"Missing doc comment for function __construct()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"29":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"37":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"45":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":39,"81-120":2}},"Line indent":{"values":{"spaces":30}},"PHP keyword case":{"values":{"lower":16}},"Multiple statements on same line":{"values":{"no":9}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"PHP type case":{"values":{"lower":4}},"Function opening brace placement":{"values":{"new line":4}},"Function has doc comment":{"values":{"no":1,"yes":3}},"PHP constant case":{"values":{"lower":1}},"Spacing before object operator":{"values":[5]},"Spacing after object operator":{"values":[5]},"Adjacent assignments aligned":{"values":{"yes":1}},"Space after operator":{"values":{"1":2}},"CamelCase method name":{"values":{"yes":2}}},"errorCount":4,"warningCount":0,"fixableCount":0,"numTokens":247},"\/home\/geert\/geerteltink\/mezzio-template\/test\/TestAsset\/ArrayParameters.php":{"hash":"b41b9d83441f38b77fe3fa8f8f29f0a933188","errors":{"19":{"30":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":16,"81-120":2}},"Line indent":{"values":{"spaces":6}},"PHP keyword case":{"values":{"lower":8}},"Multiple statements on same line":{"values":{"no":5}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"CamelCase method name":{"values":{"yes":1}},"PHP type case":{"values":{"lower":1}},"Function opening brace placement":{"values":{"new line":1}},"Function has doc comment":{"values":{"yes":1}},"Spacing before object operator":{"values":[1]},"Spacing after object operator":{"values":[1]}},"errorCount":1,"warningCount":0,"fixableCount":0,"numTokens":111},"\/home\/geert\/geerteltink\/mezzio-template\/src\/ArrayParametersTrait.php":{"hash":"f7d240e9ea034a57f4c0ed2dc175985633188","errors":{"39":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"38":{"8":[{"message":"Comment missing for @throws tag in function comment","source":"Squiz.Commenting.FunctionComment.EmptyThrows","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"37":{"8":[{"message":"Missing parameter comment","source":"Squiz.Commenting.FunctionComment.MissingParamComment","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":55,"81-120":5}},"Line indent":{"values":{"spaces":42}},"PHP keyword case":{"values":{"lower":26}},"Multiple statements on same line":{"values":{"no":15}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"CamelCase method name":{"values":{"yes":1}},"PHP type case":{"values":{"lower":2}},"Function opening brace placement":{"values":{"new line":1}},"Function has doc comment":{"values":{"yes":1}},"Spaces after control structure open parenthesis":{"values":[5]},"Spaces before control structure close parenthesis":{"values":[5]},"Blank lines at start of control structure":{"values":[5]},"Blank lines at end of control structure":{"values":[5]},"Control structure defined inline":{"values":{"no":5}},"PHP constant case":{"values":{"lower":1}},"Space before operator":{"values":{"1":2}},"Space after operator":{"values":{"1":2}},"Short array syntax used":{"values":{"yes":1}},"Array end comma":{"values":{"no":1}},"Inline comment style":{"values":{"\/\/ ...":2}},"Spacing before object operator":{"values":[2]},"Spacing after object operator":{"values":[2]},"Spacing after cast statement":{"values":{"1":1}},"Spacing before string concat":{"values":{"newline":1}},"Spacing after string concat":{"values":{"1":1}}},"errorCount":3,"warningCount":0,"fixableCount":0,"numTokens":370},"\/home\/geert\/geerteltink\/mezzio-template\/test\/TestAsset\/ViewModel.php":{"hash":"c1e6eb77330866261b8259dd85b3fe0533188","errors":{"17":{"12":[{"message":"Missing doc comment for function __construct()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"22":{"12":[{"message":"Missing doc comment for function getVariables()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":18,"81-120":2}},"Line indent":{"values":{"spaces":9}},"PHP keyword case":{"values":{"lower":9}},"Multiple statements on same line":{"values":{"no":5}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"PHP type case":{"values":{"lower":2}},"Function opening brace placement":{"values":{"new line":2}},"Function has doc comment":{"values":{"no":2}},"Spacing before object operator":{"values":[2]},"Spacing after object operator":{"values":[2]},"Space after operator":{"values":{"1":1}},"CamelCase method name":{"values":{"yes":1}}},"errorCount":2,"warningCount":0,"fixableCount":0,"numTokens":118},"\/home\/geert\/geerteltink\/mezzio-template\/test\/TestAsset\/DefaultParameters.php":{"hash":"e43edad840af99b38e902f6eeb43d76d33188","errors":{"19":{"12":[{"message":"Missing doc comment for function getParameters()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"24":{"32":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}],"5":[{"message":"Doc comment for parameter \"$params\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":20,"81-120":2}},"Line indent":{"values":{"spaces":10}},"PHP keyword case":{"values":{"lower":11}},"Multiple statements on same line":{"values":{"no":6}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"CamelCase method name":{"values":{"yes":2}},"PHP type case":{"values":{"lower":2}},"Function opening brace placement":{"values":{"new line":2}},"Function has doc comment":{"values":{"no":1,"yes":1}},"Spacing before object operator":{"values":[2]},"Spacing after object operator":{"values":[2]}},"errorCount":3,"warningCount":0,"fixableCount":0,"numTokens":146},"\/home\/geert\/geerteltink\/mezzio-template\/test\/ExceptionTest.php":{"hash":"ac87f3af9b1d0f07dd036179807d1bdf33188","errors":{"25":{"12":[{"message":"Missing doc comment for function exception()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"39":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"37":{"5":[{"message":"Doc comment for parameter \"$exception\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":32,"81-120":4}},"Line indent":{"values":{"spaces":17}},"PHP keyword case":{"values":{"lower":21}},"Multiple statements on same line":{"values":{"no":16}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"CamelCase method name":{"values":{"yes":2}},"Function opening brace placement":{"values":{"new line":2}},"Function has doc comment":{"values":{"no":1,"yes":1}},"Space after operator":{"values":{"1":5}},"Spacing before object operator":{"values":[5]},"Spacing after object operator":{"values":[5]},"Space before operator":{"values":{"1":1}},"Spacing before string concat":{"values":{"1":2}},"Spacing after string concat":{"values":{"1":2}},"Spaces after control structure open parenthesis":{"values":[1]},"Spaces before control structure close parenthesis":{"values":[1]},"Blank lines at start of control structure":{"values":[1]},"Blank lines at end of control structure":{"values":[1]},"Control structure defined inline":{"values":{"no":1}},"Short array syntax used":{"values":{"yes":1}},"Array end comma":{"values":{"no":1}},"PHP type case":{"values":{"lower":1}},"PHP constant case":{"values":{"lower":1}}},"errorCount":3,"warningCount":0,"fixableCount":0,"numTokens":306},"\/home\/geert\/geerteltink\/mezzio-template\/src\/TemplateRendererInterface.php":{"hash":"59c9819ae77660b6342542d45079de8533188","errors":{"30":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"29":{"8":[{"message":"Missing parameter comment","source":"Squiz.Commenting.FunctionComment.MissingParamComment","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false},{"message":"Doc comment for parameter $params does not match actual variable name $name","source":"Squiz.Commenting.FunctionComment.ParamNameNoMatch","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"23":{"5":[{"message":"Doc comment for parameter \"$name\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"38":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"33":{"5":[{"message":"Doc comment for parameter \"$path\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false},{"message":"Doc comment for parameter \"$namespace\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"66":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"65":{"8":[{"message":"Missing parameter comment","source":"Squiz.Commenting.FunctionComment.MissingParamComment","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"64":{"8":[{"message":"Expected 8 spaces after parameter name; 1 found","source":"Squiz.Commenting.FunctionComment.SpacingAfterParamName","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":true}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":56,"81-120":4}},"Line indent":{"values":{"spaces":46}},"PHP keyword case":{"values":{"lower":13}},"Multiple statements on same line":{"values":{"no":7}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"Constant name case":{"values":{"upper":1}},"Space after operator":{"values":{"1":1}},"CamelCase method name":{"values":{"yes":4}},"PHP type case":{"values":{"lower":4}},"Function has doc comment":{"values":{"yes":4}},"Short array syntax used":{"values":{"yes":1}},"Array end comma":{"values":{"no":1}},"PHP constant case":{"values":{"lower":1}}},"errorCount":10,"warningCount":0,"fixableCount":1,"numTokens":348},"\/home\/geert\/geerteltink\/mezzio-template\/test\/TemplatePathTest.php":{"hash":"a0180ff5c71801b0a5c020b303c824c233188","errors":{"23":{"12":[{"message":"Missing doc comment for function testCanProvideNamespaceAtInstantiation()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"30":{"12":[{"message":"Missing doc comment for function testCanInstantiateWithoutANamespace()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"37":{"12":[{"message":"Missing doc comment for function testCastingToStringReturnsPathOnly()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":34,"81-120":2}},"Line indent":{"values":{"spaces":20}},"PHP keyword case":{"values":{"lower":17}},"Multiple statements on same line":{"values":{"no":15}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"CamelCase method name":{"values":{"yes":3}},"Function opening brace placement":{"values":{"new line":3}},"Function has doc comment":{"values":{"no":3}},"Space after operator":{"values":{"1":4}},"Spacing before object operator":{"values":[6]},"Spacing after object operator":{"values":[6]}},"errorCount":3,"warningCount":0,"fixableCount":0,"numTokens":271},"\/home\/geert\/geerteltink\/mezzio-template\/src\/DefaultParamsTrait.php":{"hash":"1e7987289f0ae22b313e0b776da3aaf133188","errors":{"42":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"41":{"8":[{"message":"Comment missing for @throws tag in function comment","source":"Squiz.Commenting.FunctionComment.EmptyThrows","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"40":{"8":[{"message":"Missing parameter comment","source":"Squiz.Commenting.FunctionComment.MissingParamComment","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"39":{"8":[{"message":"Expected 8 spaces after parameter name; 1 found","source":"Squiz.Commenting.FunctionComment.SpacingAfterParamName","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":true}]},"62":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"60":{"5":[{"message":"Doc comment for parameter \"$template\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false},{"message":"Doc comment for parameter \"$params\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":52,"81-120":7}},"Line indent":{"values":{"spaces":44}},"PHP keyword case":{"values":{"lower":18}},"Multiple statements on same line":{"values":{"no":11}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"Space after operator":{"values":{"1":7}},"Short array syntax used":{"values":{"yes":4}},"Array end comma":{"values":{"no":4}},"CamelCase method name":{"values":{"yes":2}},"PHP type case":{"values":{"lower":2}},"Function opening brace placement":{"values":{"new line":2}},"Function has doc comment":{"values":{"yes":2}},"Spaces after control structure open parenthesis":{"values":[3]},"Spaces before control structure close parenthesis":{"values":[3]},"Blank lines at start of control structure":{"values":[3]},"Blank lines at end of control structure":{"values":[3]},"Control structure defined inline":{"values":{"no":3}},"Spacing before object operator":{"values":[6]},"Spacing after object operator":{"values":[6]},"Adjacent assignments aligned":{"values":{"yes":1}},"Space before operator":{"values":{"1":2}}},"errorCount":7,"warningCount":0,"fixableCount":1,"numTokens":418},"\/home\/geert\/geerteltink\/mezzio-template\/test\/TemplatePathAssertionsTrait.php":{"hash":"9c8bfdb40b67d092b48b08b8702f1e9433188","errors":{"20":{"28":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}],"5":[{"message":"Doc comment for parameter \"$templatePath\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false},{"message":"Doc comment for parameter \"$message\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"27":{"28":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}],"5":[{"message":"Doc comment for parameter \"$templatePath\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false},{"message":"Doc comment for parameter \"$message\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"34":{"33":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}],"5":[{"message":"Doc comment for parameter \"$templatePath\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false},{"message":"Doc comment for parameter \"$message\" missing","source":"Squiz.Commenting.FunctionComment.MissingParamTag","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"44":{"12":[{"message":"Missing doc comment for function assertEmptyTemplatePathNamespace()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"50":{"12":[{"message":"Missing doc comment for function assertEqualTemplatePath()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"53":{"13":[{"message":"Expected 0 spaces after opening bracket; newline found","source":"Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpenBrace","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\WhiteSpace\\ControlStructureSpacingSniff","severity":0,"fixable":true}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":39,"81-120":11}},"Line indent":{"values":{"spaces":36}},"PHP keyword case":{"values":{"lower":17}},"Multiple statements on same line":{"values":{"no":15}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"CamelCase method name":{"values":{"yes":5}},"PHP type case":{"values":{"lower":6}},"Function opening brace placement":{"values":{"new line":5}},"Function has doc comment":{"values":{"yes":3,"no":2}},"PHP constant case":{"values":{"lower":6}},"Space after operator":{"values":{"1":12}},"Space before operator":{"values":{"1":12}},"Spacing before object operator":{"values":[12]},"Spacing after object operator":{"values":[12]},"Spacing after cast statement":{"values":{"1":1}},"Spaces after control structure open parenthesis":{"values":{"newline":1}},"Spaces before control structure close parenthesis":{"values":[1]},"Blank lines at start of control structure":{"values":[1]},"Blank lines at end of control structure":{"values":[1]},"Control structure defined inline":{"values":{"no":1}}},"errorCount":12,"warningCount":0,"fixableCount":1,"numTokens":480},"\/home\/geert\/geerteltink\/mezzio-template\/test\/ArrayParametersTraitTest.php":{"hash":"b21f467b479a9ef72abaab69f0e4097b33188","errors":{"22":{"15":[{"message":"Missing doc comment for function setUp()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"27":{"12":[{"message":"Missing doc comment for function testNullParamsAreReturnedAsEmptyArray()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"32":{"12":[{"message":"Missing doc comment for function testArrayParamsAreReturnedVerbatim()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"38":{"12":[{"message":"Missing doc comment for function testExtractsVariablesFromObjectsImplementingGetVariables()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"45":{"12":[{"message":"Missing doc comment for function testCastsTraversablesToArrays()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"52":{"12":[{"message":"Missing doc comment for function testCastsObjectsToArrays()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"59":{"12":[{"message":"Missing doc comment for function nonNullScalarParameters()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"79":{"6":[{"message":"Missing @return tag in function comment","source":"Squiz.Commenting.FunctionComment.MissingReturn","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"77":{"8":[{"message":"Missing parameter comment","source":"Squiz.Commenting.FunctionComment.MissingParamComment","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"78":{"8":[{"message":"Missing parameter comment","source":"Squiz.Commenting.FunctionComment.MissingParamComment","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"80":{"12":[{"message":"Type hint \"string\" missing for $expectedString","source":"Squiz.Commenting.FunctionComment.ScalarTypeHintMissing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":71,"81-120":2}},"Line indent":{"values":{"spaces":59}},"PHP keyword case":{"values":{"lower":28}},"Multiple statements on same line":{"values":{"no":23}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"CamelCase method name":{"values":{"yes":8}},"PHP type case":{"values":{"lower":2}},"Function opening brace placement":{"values":{"new line":8}},"Function has doc comment":{"values":{"no":7,"yes":1}},"Spacing before object operator":{"values":[21]},"Spacing after object operator":{"values":[21]},"Space after operator":{"values":{"1":19}},"Short array syntax used":{"values":{"yes":13}},"Array end comma":{"values":{"no":12,"yes":1}},"PHP constant case":{"values":{"lower":3}},"Adjacent assignments aligned":{"values":{"yes":3}},"Spacing after cast statement":{"values":{"1":1}},"Inline comment style":{"values":{"\/\/ ...":3}}},"errorCount":11,"warningCount":0,"fixableCount":0,"numTokens":604},"\/home\/geert\/geerteltink\/mezzio-template\/test\/DefaultParamsTraitTest.php":{"hash":"8acb381f172ec625d05476d5c8150ff933188","errors":{"27":{"15":[{"message":"Missing doc comment for function setUp()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"33":{"12":[{"message":"Missing doc comment for function testDefaultParamArray()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"51":{"12":[{"message":"Missing doc comment for function testMergingParamsWithDefaultParamArray()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"86":{"12":[{"message":"Missing doc comment for function testExceptionOnAddDefaultParamWhenEmptyTemplateName()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]},"93":{"12":[{"message":"Missing doc comment for function testExceptionOnAddDefaultParamWhenEmptyParamName()","source":"Squiz.Commenting.FunctionComment.Missing","listener":"PHP_CodeSniffer\\Standards\\Squiz\\Sniffs\\Commenting\\FunctionCommentSniff","severity":0,"fixable":false}]}},"warnings":[],"metrics":{"Declarations and side effects mixed":{"values":{"no":1}},"PHP short open tag used":{"values":{"no":1}},"EOL char":{"values":{"\\n":1}},"Number of newlines at EOF":{"values":{"1":1}},"PHP closing tag at end of PHP-only file":{"values":{"no":1}},"Line length":{"values":{"80 or less":77,"81-120":5}},"Line indent":{"values":{"spaces":66}},"PHP keyword case":{"values":{"lower":23}},"Multiple statements on same line":{"values":{"no":27}},"One class per file":{"values":{"yes":1}},"Class defined in namespace":{"values":{"yes":1}},"PascalCase class name":{"values":{"yes":1}},"Class opening brace placement":{"values":{"new line":1}},"CamelCase method name":{"values":{"yes":5}},"PHP type case":{"values":{"lower":1}},"Function opening brace placement":{"values":{"new line":5}},"Function has doc comment":{"values":{"no":5}},"Spacing before object operator":{"values":[30]},"Spacing after object operator":{"values":[30]},"Adjacent assignments aligned":{"values":{"yes":2}},"Space after operator":{"values":{"1":36}},"Short array syntax used":{"values":{"yes":20}},"Array end comma":{"values":{"yes":8,"no":12}},"Inline comment style":{"values":{"\/\/ ...":2}}},"errorCount":5,"warningCount":0,"fixableCount":0,"numTokens":710}} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 10dded4..7eb45ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,30 +6,30 @@ cache: env: global: - - COMPOSER_ARGS="--no-interaction" + - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs" - COVERAGE_DEPS="php-coveralls/php-coveralls" matrix: fast_finish: true include: - - php: 7.1 + - php: 7.3 env: - DEPS=lowest - - php: 7.1 + - php: 7.3 env: - DEPS=latest - - CS_CHECK=true - - TEST_COVERAGE=true - - php: 7.2 + - php: 7.4 env: - DEPS=lowest - - php: 7.2 + - php: 7.4 env: - DEPS=latest - - php: 7.3 + - CS_CHECK=true + - TEST_COVERAGE=true + - php: nightly env: - DEPS=lowest - - php: 7.3 + - php: nightly env: - DEPS=latest diff --git a/composer.json b/composer.json index 77be9d3..e426df6 100644 --- a/composer.json +++ b/composer.json @@ -19,16 +19,14 @@ "config": { "sort-packages": true }, - "extra": { - }, "require": { - "php": "^7.1", + "php": "^7.3 || ~8.0.0", "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-coding-standard": "~2.1.0", "malukenho/docheader": "^0.1.6", - "phpunit/phpunit": "^7.0.2" + "phpunit/phpunit": "^9.3" }, "suggest": { "mezzio/mezzio-laminasviewrenderer": "^2.0 to use the laminas-view PhpRenderer template renderer", diff --git a/phpcs.xml b/phpcs.xml index 1a80a86..1efe663 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,8 +1,20 @@ - - + + + + + + + + + + src test + + + diff --git a/phpunit.xml.dist b/phpunit.xml.dist index b41a6d4..d2fff42 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,17 +1,13 @@ - - - - ./test - - - - - - src - - + + + + ./src + + + + + ./test + + diff --git a/src/ArrayParametersTrait.php b/src/ArrayParametersTrait.php index 58fea22..f620bf6 100644 --- a/src/ArrayParametersTrait.php +++ b/src/ArrayParametersTrait.php @@ -12,7 +12,6 @@ use Traversable; -use function get_class; use function gettype; use function is_array; use function is_object; @@ -36,9 +35,9 @@ trait ArrayParametersTrait * - scalar values result in an exception * * @param mixed $params - * @throws Exception\InvalidArgumentException for non-array, non-object parameters. + * @throws Exception\InvalidArgumentException */ - private function normalizeParams($params) : array + private function normalizeParams($params): array { if (null === $params) { return []; @@ -65,7 +64,7 @@ private function normalizeParams($params) : array throw new Exception\InvalidArgumentException(sprintf( '%s template adapter can only handle arrays, Traversables, and objects ' . 'when rendering; received %s', - get_class($this), + static::class, gettype($params) )); } diff --git a/src/DefaultParamsTrait.php b/src/DefaultParamsTrait.php index 6aad142..16b6aed 100644 --- a/src/DefaultParamsTrait.php +++ b/src/DefaultParamsTrait.php @@ -17,9 +17,7 @@ */ trait DefaultParamsTrait { - /** - * @var array - */ + /** @var array */ private $defaultParams = []; /** @@ -39,10 +37,10 @@ trait DefaultParamsTrait * @param string $templateName Name of template to which the param applies; * use TEMPLATE_ALL to apply to all templates. * @param string $param Param name. - * @param mixed $value + * @param mixed $value * @throws Exception\InvalidArgumentException */ - public function addDefaultParam(string $templateName, string $param, $value) : void + public function addDefaultParam(string $templateName, string $param, $value): void { if (! $templateName) { throw new Exception\InvalidArgumentException('$templateName must be a non-empty string'); @@ -62,9 +60,9 @@ public function addDefaultParam(string $templateName, string $param, $value) : v /** * Returns merged global, template-specific and given params */ - private function mergeParams(string $template, array $params) : array + private function mergeParams(string $template, array $params): array { - $globalDefaults = $this->defaultParams[TemplateRendererInterface::TEMPLATE_ALL] ?? []; + $globalDefaults = $this->defaultParams[TemplateRendererInterface::TEMPLATE_ALL] ?? []; $templateDefaults = $this->defaultParams[$template] ?? []; return array_replace_recursive($globalDefaults, $templateDefaults, $params); diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php index 9e4ad33..d125917 100644 --- a/src/Exception/InvalidArgumentException.php +++ b/src/Exception/InvalidArgumentException.php @@ -10,6 +10,8 @@ namespace Mezzio\Template\Exception; -class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface +use InvalidArgumentException as SplInvalidArgumentException; + +class InvalidArgumentException extends SplInvalidArgumentException implements ExceptionInterface { } diff --git a/src/TemplatePath.php b/src/TemplatePath.php index f26fcf6..783cb70 100644 --- a/src/TemplatePath.php +++ b/src/TemplatePath.php @@ -12,17 +12,13 @@ class TemplatePath { - /** - * @var string - */ + /** @var string */ protected $path; - /** - * @var null|string - */ + /** @var null|string */ protected $namespace; - public function __construct(string $path, string $namespace = null) + public function __construct(string $path, ?string $namespace = null) { $this->path = $path; $this->namespace = $namespace; @@ -31,7 +27,7 @@ public function __construct(string $path, string $namespace = null) /** * Casts to string by returning the path only. */ - public function __toString() : string + public function __toString(): string { return $this->path; } @@ -39,7 +35,7 @@ public function __toString() : string /** * Get the namespace */ - public function getNamespace() : ?string + public function getNamespace(): ?string { return $this->namespace; } @@ -47,7 +43,7 @@ public function getNamespace() : ?string /** * Get the path */ - public function getPath() : string + public function getPath(): string { return $this->path; } diff --git a/src/TemplateRendererInterface.php b/src/TemplateRendererInterface.php index 05919e2..d6ef753 100644 --- a/src/TemplateRendererInterface.php +++ b/src/TemplateRendererInterface.php @@ -28,7 +28,7 @@ interface TemplateRendererInterface * * @param array|object $params */ - public function render(string $name, $params = []) : string; + public function render(string $name, $params = []): string; /** * Add a template path to the engine. @@ -36,14 +36,14 @@ public function render(string $name, $params = []) : string; * Adds a template path, with optional namespace the templates in that path * provide. */ - public function addPath(string $path, string $namespace = null) : void; + public function addPath(string $path, ?string $namespace = null): void; /** * Retrieve configured paths from the engine. * * @return TemplatePath[] */ - public function getPaths() : array; + public function getPaths(): array; /** * Add a default parameter to use with a template. @@ -62,7 +62,7 @@ public function getPaths() : array; * @param string $templateName Name of template to which the param applies; * use TEMPLATE_ALL to apply to all templates. * @param string $param Param name. - * @param mixed $value + * @param mixed $value */ - public function addDefaultParam(string $templateName, string $param, $value) : void; + public function addDefaultParam(string $templateName, string $param, $value): void; } diff --git a/test/ArrayParametersTraitTest.php b/test/ArrayParametersTraitTest.php index c560487..73fba3b 100644 --- a/test/ArrayParametersTraitTest.php +++ b/test/ArrayParametersTraitTest.php @@ -19,7 +19,7 @@ class ArrayParametersTraitTest extends TestCase /** @var TestAsset\ArrayParameters */ private $subject; - public function setUp() + protected function setUp(): void { $this->subject = new TestAsset\ArrayParameters(); } @@ -74,8 +74,7 @@ public function nonNullScalarParameters() /** * @dataProvider nonNullScalarParameters - * - * @param mixed $scalar + * @param mixed $scalar * @param string $expectedString */ public function testNonNullScalarsRaiseAnException($scalar, $expectedString) diff --git a/test/DefaultParamsTraitTest.php b/test/DefaultParamsTraitTest.php index 7fc6868..2d2d535 100644 --- a/test/DefaultParamsTraitTest.php +++ b/test/DefaultParamsTraitTest.php @@ -18,17 +18,13 @@ class DefaultParamsTraitTest extends TestCase { - /** - * @var ArrayParameters - */ + /** @var ArrayParameters */ private $arrayParams; - /** - * @var DefaultParameters - */ + /** @var DefaultParameters */ private $defaultParams; - protected function setUp() + protected function setUp(): void { $this->arrayParams = new ArrayParameters(); $this->defaultParams = new DefaultParameters(); diff --git a/test/ExceptionTest.php b/test/ExceptionTest.php index e568150..bafd1af 100644 --- a/test/ExceptionTest.php +++ b/test/ExceptionTest.php @@ -22,7 +22,7 @@ class ExceptionTest extends TestCase { - public function exception() : Generator + public function exception(): Generator { $namespace = substr(ExceptionInterface::class, 0, strrpos(ExceptionInterface::class, '\\') + 1); @@ -37,9 +37,9 @@ public function exception() : Generator /** * @dataProvider exception */ - public function testExceptionIsInstanceOfExceptionInterface(string $exception) : void + public function testExceptionIsInstanceOfExceptionInterface(string $exception): void { - self::assertContains('Exception', $exception); + self::assertStringContainsString('Exception', $exception); self::assertTrue(is_a($exception, ExceptionInterface::class, true)); } } diff --git a/test/TemplatePathAssertionsTrait.php b/test/TemplatePathAssertionsTrait.php index c191be6..49c30a9 100644 --- a/test/TemplatePathAssertionsTrait.php +++ b/test/TemplatePathAssertionsTrait.php @@ -17,19 +17,22 @@ trait TemplatePathAssertionsTrait { - public function assertTemplatePath($path, TemplatePath $templatePath, $message = null) + /** @param mixed $path */ + public function assertTemplatePath($path, TemplatePath $templatePath, ?string $message = null) { $message = $message ?: sprintf('Failed to assert TemplatePath contained path %s', $path); $this->assertEquals($path, $templatePath->getPath(), $message); } - public function assertTemplatePathString($path, TemplatePath $templatePath, $message = null) + /** @param mixed $path */ + public function assertTemplatePathString($path, TemplatePath $templatePath, ?string $message = null) { $message = $message ?: sprintf('Failed to assert TemplatePath casts to string path %s', $path); $this->assertEquals($path, (string) $templatePath, $message); } - public function assertTemplatePathNamespace($namespace, TemplatePath $templatePath, $message = null) + /** @param mixed $namespace */ + public function assertTemplatePathNamespace($namespace, TemplatePath $templatePath, ?string $message = null) { $message = $message ?: sprintf( 'Failed to assert TemplatePath namespace matched %s', @@ -38,16 +41,17 @@ public function assertTemplatePathNamespace($namespace, TemplatePath $templatePa $this->assertEquals($namespace, $templatePath->getNamespace(), $message); } - public function assertEmptyTemplatePathNamespace(TemplatePath $templatePath, $message = null) + public function assertEmptyTemplatePathNamespace(TemplatePath $templatePath, ?string $message = null) { $message = $message ?: 'Failed to assert TemplatePath namespace was empty'; $this->assertEmpty($templatePath->getNamespace(), $message); } - public function assertEqualTemplatePath(TemplatePath $expected, TemplatePath $received, $message = null) + public function assertEqualTemplatePath(TemplatePath $expected, TemplatePath $received, ?string $message = null) { $message = $message ?: 'Failed to assert TemplatePaths are equal'; - if ($expected->getPath() !== $received->getPath() + if ( + $expected->getPath() !== $received->getPath() || $expected->getNamespace() !== $received->getNamespace() ) { $this->fail($message); diff --git a/test/TestAsset/ArrayParameters.php b/test/TestAsset/ArrayParameters.php index 774adb5..0eae281 100644 --- a/test/TestAsset/ArrayParameters.php +++ b/test/TestAsset/ArrayParameters.php @@ -16,7 +16,8 @@ class ArrayParameters { use ArrayParametersTrait; - public function normalize($params) + /** @param mixed $params */ + public function normalize($params): array { return $this->normalizeParams($params); } diff --git a/test/TestAsset/DefaultParameters.php b/test/TestAsset/DefaultParameters.php index 38fdb87..c72de34 100644 --- a/test/TestAsset/DefaultParameters.php +++ b/test/TestAsset/DefaultParameters.php @@ -16,12 +16,13 @@ class DefaultParameters { use DefaultParamsTrait; - public function getParameters() + public function getParameters(): array { return $this->defaultParams; } - public function mergeParameters($template, array $params) + /** @param mixed $template */ + public function mergeParameters($template, array $params): array { return $this->mergeParams($template, $params); } diff --git a/test/TestAsset/ViewModel.php b/test/TestAsset/ViewModel.php index 6337512..959308e 100644 --- a/test/TestAsset/ViewModel.php +++ b/test/TestAsset/ViewModel.php @@ -19,7 +19,7 @@ public function __construct(array $variables) $this->variables = $variables; } - public function getVariables() + public function getVariables(): array { return $this->variables; }