PHP7.1, code style, phpstan

Author: mabar

.docs/README.md

@@ -64,10 +64,10 @@ use Contributte\Latte\Filters\FiltersProvider;
 final class MyFilters implements FiltersProvider
 {
 
-	/**
-	 * @return array
-	 */
-	public function getFilters()
+    /**
+   	 * @return callable[]
+     */
+	public function getFilters(): array
 	{
 		return [
 			'say' => function ($hi) {
@@ -117,21 +117,21 @@ This is my email: <a href="mailto: my[at]email.org">my[at]email.org</a>
 
 ### `NumberFormatter`
 
-Number formatter is simple wrapping class over `number_format` method. 
+Number formatter is simple wrapping class over `number_format` method.
 
 ```yaml
 services:
-    formatter.money: 
+    formatter.money:
         # with defined prefix
-        class: Contributte\Latte\Formatters\NumberFormatter('Kč') 
-        
-    formatter.weight: 
+        class: Contributte\Latte\Formatters\NumberFormatter('Kč')
+
+    formatter.weight:
         # with defined prefix and suffix
         class: Contributte\Latte\Formatters\NumberFormatter('kg', '~')
         setup:
-            - setThousands(NULL)
+            - setThousands('')
             - setDecimals(0)
-    
+
     nette.latteFactory:
         setup:
             # used as latte filter

.editorconfig

@@ -1,26 +1,20 @@
 # EditorConfig is awesome: http://EditorConfig.org
 
-# Top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
-
-# JS / PHP
-[*.{js,php,phpt}]
-charset = utf-8
+trim_trailing_whitespace = true
 indent_style = tab
-indent_size = 4
+indent_size = tab
+tab_width = 4
 
-# NEON
-[*.neon]
-charset = utf-8
-indent_style = tab
+[*.md]
+indent_style = space
 indent_size = 4
 
-# Composer, NPM, Travis, BitbucketPipelines
-[{composer.json,package.json,.travis.yml,bitbucket-pipelines.yml}]
+[{composer.json,package.json,.travis.yml}]
 indent_style = space
 indent_size = 2

.gitignore

@@ -1,8 +1,13 @@
+# IDE
+/.idea
+
 # Composer
 /vendor
 /composer.lock
 
 # Tests
+/temp/
 /tests/*.log
 /tests/tmp
 /tests/coverage.html
+/coverage.xml

.travis.yml

@@ -1,51 +1,58 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
-  - hhvm
+  - 7.2
 
-matrix:
-  fast_finish: true
+before_install:
+  # turn off XDebug
+  - phpenv config-rm xdebug.ini || return 0
 
-  allow_failures:
-      - php: hhvm
-
-  include:
-    - php: 5.6
-      env: COMPOSER_FLAG=--prefer-lowest
-    - php: 5.6
-      env: COMPOSER_FLAG=--prefer-stable
-    - php: 7.0
-      env: COMPOSER_FLAG=--prefer-lowest
-    - php: 7.0
-      env: COMPOSER_FLAG=--prefer-stable
-    - php: 7.1
-      env: COMPOSER_FLAG=--prefer-lowest
-    - php: 7.1
-      env: COMPOSER_FLAG=--prefer-stable
-
-before_script:
+install:
   # Composer
-  - travis_retry composer install --no-interaction
-  # Coverage
-  - if [[ "$TRAVIS_PHP_VERSION" == "7.1" && "$COMPOSER_FLAG" == "" ]]; then COVERAGE=1; fi
+  - travis_retry composer install --no-progress --prefer-dist
 
 script:
-  # Quality Assurance
-  - travis_retry composer qa
-
-  # Nette\Tester
+  # Nette/Tester
   - composer run-script tester
 
-  # Nette\Tester + CodeCoverage
-  - if [ "$COVERAGE" != "" ]; then composer tester-coverage; fi
+jobs:
+  include:
+    - env: title="Lowest Dependencies 7.1"
+      php: 7.1
+      install:
+        - travis_retry composer update --no-progress --prefer-dist --prefer-lowest
+      script:
+        - composer run-script tester
+
+    - env: title="Lowest Dependencies 7.2"
+      php: 7.2
+      install:
+        - travis_retry composer update --no-progress --prefer-dist --prefer-lowest
+      script:
+        - composer run-script tester
+
+    - stage: Quality Assurance
+      php: 7.2
+      script:
+        - composer run-script qa
+
+    - stage: Test Coverage
+      php: 7.2
+      script:
+        - composer run-script coverage
+      after_script:
+        - wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.0.0/php-coveralls.phar
+        - php coveralls.phar --verbose --config tests/.coveralls.yml
 
-after_script:
-  # Coverage (Coveralls)
-  - if [ "$COVERAGE" != "" ]; then wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
-  - if [ "$COVERAGE" != "" ]; then php coveralls.phar --verbose --config tests/.coveralls.yml; fi
+    - stage: Phpstan
+      php: 7.2
+      script:
+        - composer run-script phpstan-install
+        - composer run-script phpstan
+
+  allow_failures:
+    - stage: Test Coverage
 
 after_failure:
   # Print *.actual content

README.md

@@ -26,6 +26,8 @@ composer require contributte/latte
 
 | State       | Version | Branch   | PHP      |
 |-------------|---------|----------|----------|
+| dev         | `^0.4`  | `master` | `>= 7.1` |
+| stable      | `^0.3`  | `master` | `>= 7.1` |
 | stable      | `^0.2`  | `master` | `>= 5.6` |
 
 ## Overview
@@ -48,6 +50,13 @@ composer require contributte/latte
         </br>
         <a href="https://github.com/f3l1x">Milan Felix Šulc</a>
       </td>
+      <td align="center">
+        <a href="https://github.com/mabar">
+            <img width="150" height="150" src="https://avatars0.githubusercontent.com/u/20974277?s=400&v=4">
+        </a>
+        </br>
+        <a href="https://github.com/mabar">Marek Bartoš</a>
+      </td>
     </tr>
   <tbody>
 </table>

composer.json

@@ -1,9 +1,15 @@
 {
   "name": "contributte/latte",
   "description": "Extra contrib to nette/latte",
-  "keywords": ["nette", "latte", "extra"],
+  "keywords": [
+    "nette",
+    "latte",
+    "extra"
+  ],
   "type": "library",
-  "license": ["MIT"],
+  "license": [
+    "MIT"
+  ],
   "homepage": "https://github.com/contributte/latte",
   "authors": [
     {
@@ -12,18 +18,23 @@
     }
   ],
   "require": {
-    "php": ">= 5.6",
-    "latte/latte": "^2.4.4"
+    "php": ">= 7.1",
+    "latte/latte": "~2.4.4"
   },
   "require-dev": {
-    "ninjify/qa": "^0.4.0",
-    "ninjify/nunjuck": "^0.1.4",
-    "nette/application": "^2.4.6",
-    "nette/di": "^2.4.8"
+    "ninjify/qa": "^0.8.0",
+    "ninjify/nunjuck": "^0.2.0",
+    "nette/application": "~2.4.6",
+    "nette/di": "~2.4.12"
+  },
+  "conflict": {
+    "nette/utils": "<2.5.2"
   },
   "suggest": {
     "nette/di": "to use VersionExtension[CompilerExtension]"
   },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
   "autoload": {
     "psr-4": {
       "Contributte\\Latte\\": "src"
@@ -42,8 +53,17 @@
     "tester": [
       "tester -s -p php --colors 1 -c tests/php-unix.ini tests/cases"
     ],
-    "tester-coverage": [
+    "coverage": [
       "tester -s -p php --colors 1 -c tests/php-unix.ini -d extension=xdebug.so --coverage ./coverage.xml --coverage-src ./src tests/cases"
+    ],
+    "phpstan-install": [
+      "mkdir -p temp/phpstan",
+      "composer require -d temp/phpstan phpstan/phpstan:0.9.2",
+      "composer require -d temp/phpstan phpstan/phpstan-nette:0.9",
+      "composer require -d temp/phpstan phpstan/phpstan-strict-rules:0.9"
+    ],
+    "phpstan": [
+      "temp/phpstan/vendor/bin/phpstan analyse -l max -c phpstan.neon src"
     ]
   }
 }

phpstan.neon

@@ -0,0 +1,4 @@
+includes:
+	- temp/phpstan/vendor/phpstan/phpstan-strict-rules/rules.neon
+	- temp/phpstan/vendor/phpstan/phpstan-nette/extension.neon
+	- temp/phpstan/vendor/phpstan/phpstan-nette/rules.neon

ruleset.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset name="Contributte">
+    <!-- Contributte Coding Standard -->
+    <rule ref="./vendor/ninjify/coding-standard/contributte.xml">
+		<exclude name="SlevomatCodingStandard.Operators.DisallowIncrementAndDecrementOperators.DisallowedPostIncrementOperator"/>
+	</rule>
+
+    <!-- Specific rules -->
+    <rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
+        <properties>
+            <property name="rootNamespaces" type="array" value="
+                src=>Contributte\Latte,
+                tests/fixtures=>Tests\Fixtures
+            "/>
+        </properties>
+    </rule>
+
+    <!-- Exclude folders -->
+    <exclude-pattern>/tests/tmp</exclude-pattern>
+</ruleset>

src/DI/FiltersExtension.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Contributte\Latte\DI;
 
@@ -7,23 +7,17 @@
 use Nette\Bridges\ApplicationLatte\ILatteFactory;
 use Nette\DI\CompilerExtension;
 
-/**
- * @author Milan Felix Sulc <sulcmil@gmail.com>
- * @author Tomas Votruba <info@tomasvotruba.cz>
- */
 class FiltersExtension extends CompilerExtension
 {
 
 	/**
 	 * Decorate services
-	 *
-	 * @return void
 	 */
-	public function beforeCompile()
+	public function beforeCompile(): void
 	{
 		$builder = $this->getContainerBuilder();
 
-		if ($builder->getByType(ILatteFactory::class) === NULL) {
+		if ($builder->getByType(ILatteFactory::class) === null) {
 			throw new LatteDefinitionNotFoundException();
 		}
 

src/DI/VersionExtension.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Contributte\Latte\DI;
 
@@ -8,38 +8,33 @@
 use Nette\DI\CompilerExtension;
 use Nette\PhpGenerator\PhpLiteral;
 
-/**
- * @author Milan Felix Sulc <sulcmil@gmail.com>
- */
 class VersionExtension extends CompilerExtension
 {
 
-	/** @var array */
+	/** @var mixed[] */
 	private $defaults = [
-		'debug' => FALSE,
-		'rev' => NULL,
-		'build' => NULL,
-		'v' => NULL,
+		'debug' => false,
+		'rev' => null,
+		'build' => null,
+		'v' => null,
 	];
 
 	/**
 	 * Decorate services
-	 *
-	 * @return void
 	 */
-	public function beforeCompile()
+	public function beforeCompile(): void
 	{
 		$builder = $this->getContainerBuilder();
 		$config = $this->validateConfig($this->defaults);
 
-		if ($builder->getByType(ILatteFactory::class) === NULL) {
+		if ($builder->getByType(ILatteFactory::class) === null) {
 			throw new LatteDefinitionNotFoundException();
 		}
 
-		if ($config['debug'] === TRUE) {
-			$config['rev'] = md5(microtime() . mt_rand(0, 100));
-			$config['build'] = md5(microtime() . mt_rand(0, 100));
-			$config['v'] = md5(microtime() . mt_rand(0, 100));
+		if ($config['debug'] === true) {
+			$config['rev'] = md5(microtime() . random_int(0, 100));
+			$config['build'] = md5(microtime() . random_int(0, 100));
+			$config['v'] = md5(microtime() . random_int(0, 100));
 		}
 
 		$builder->getDefinitionByType(ILatteFactory::class)