PHP 7.1, coding style

.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,10 +1,13 @@
 # IDE
 /.idea
 
-# Folders
+# Composer
 /vendor
-
-# Files
 /composer.lock
+
+# Tests
+/temp/
 /tests/*.log
 /tests/tmp
+/tests/coverage.html
+/coverage.xml

.travis.yml

@@ -1,7 +1,8 @@
 language: php
+
 php:
-    - 7.1
-    - 7.2
+  - 7.1
+  - 7.2
 
 before_install:
   # turn off XDebug
@@ -24,28 +25,34 @@ jobs:
       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.1
+      php: 7.2
       script:
         - composer run-script qa
 
     - stage: Test Coverage
-      php: 7.1
+      php: 7.2
       script:
         - composer run-script coverage
       after_script:
-        - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
+        - wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.0.0/php-coveralls.phar
         - php coveralls.phar --verbose --config tests/.coveralls.yml
 
     - stage: Phpstan
-      php: 7.1
+      php: 7.2
       script:
         - composer run-script phpstan-install
         - composer run-script phpstan
 
   allow_failures:
     - stage: Test Coverage
-    - stage: Phpstan
 
 after_failure:
   # Print *.actual content

composer.json

@@ -2,7 +2,9 @@
   "name": "contributte/latte-parsedown-extra",
   "description": "ParsedownExtra parser for Latte",
   "type": "library",
-  "license": ["MIT"],
+  "license": [
+    "MIT"
+  ],
   "homepage": "https://github.com/contributte/latte-parsedown-extra",
   "authors": [
     {
@@ -11,18 +13,20 @@
     }
   ],
   "require": {
-    "php": ">=5.6.0",
+    "php": ">= 7.1",
     "nette/di": "~2.4.10",
-    "nette/utils": "~2.4.9",
+    "nette/utils": "~2.5.2",
     "latte/latte": "~2.4.7",
     "erusev/parsedown-extra": "^0.7.1",
     "erusev/parsedown": "~1.7.1"
   },
   "require-dev": {
-    "ninjify/qa": "^0.4.0",
+    "ninjify/qa": "^0.8.0",
     "ninjify/nunjuck": "^0.2.0",
     "nette/application": "~2.4.9"
   },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
   "autoload": {
     "psr-4": {
       "Contributte\\Parsedown\\": "src/"
@@ -41,11 +45,12 @@
     ],
     "phpstan-install": [
       "mkdir -p temp/phpstan",
-      "composer require -d temp/phpstan phpstan/phpstan:0.8.5",
-      "composer require -d temp/phpstan phpstan/phpstan-nette:0.8.3"
+      "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 1 -c phpstan.neon src"
+      "temp/phpstan/vendor/bin/phpstan analyse -l max -c phpstan.neon src"
     ]
   }
 }

phpstan.neon

@@ -1,5 +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
-
-parameters:

readme.md

@@ -26,7 +26,9 @@ composer require contributte/latte-parsedown-extra
 
 | State       | Version  | Branch   | PHP      |
 |-------------|----------|----------|----------|
-| stable      | `^1.1.0` | `master` | `>= 5.6` |
+| dev         | `^1.4.0` | `master` | `>= 7.1` |
+| stable      | `^1.3.0` | `master` | `>= 7.1` |
+| stable      | `^1.2.0` | `master` | `>= 5.6` |
 
 ## Overview
 
@@ -46,6 +48,13 @@ composer require contributte/latte-parsedown-extra
         </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>

ruleset.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 <ruleset name="Markette">
-    <!-- Extending rulesets -->
-    <rule ref="vendor/ninjify/coding-standard/ruleset.xml"/>
-    <!-- My rules -->
+	<!-- Contributte Coding Standard -->
+	<rule ref="./vendor/ninjify/coding-standard/contributte.xml">
+		<exclude name="Squiz.Commenting.FunctionComment.InvalidTypeHint"/>
+	</rule>
+
+	<!-- Specific rules -->
     <rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
         <properties>
             <property name="rootNamespaces" type="array" value="

src/DI/ParsedownExtraExtension.php

@@ -1,32 +1,29 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Contributte\Parsedown\DI;
 
 use Contributte\Parsedown\ParsedownExtraAdapter;
 use Contributte\Parsedown\ParsedownFilter;
+use Nette\Bridges\ApplicationLatte\ILatteFactory;
 use Nette\DI\CompilerExtension;
 use Nette\DI\Statement;
 use Nette\InvalidStateException;
 
 /**
  * ParsedownExtra Extension
- *
- * @author Milan Felix Sulc <[email protected]>
  */
 class ParsedownExtraExtension extends CompilerExtension
 {
 
-	/** @var array */
+	/** @var mixed[] */
 	private $defaults = [
 		'helper' => 'parsedown',
 	];
 
 	/**
 	 * Register services
-	 *
-	 * @return void
 	 */
-	public function loadConfiguration()
+	public function loadConfiguration(): void
 	{
 		$this->validateConfig($this->defaults);
 		$builder = $this->getContainerBuilder();
@@ -37,17 +34,15 @@ public function loadConfiguration()
 
 	/**
 	 * Decorate services
-	 *
-	 * @return void
 	 */
-	public function beforeCompile()
+	public function beforeCompile(): void
 	{
 		$config = $this->validateConfig($this->defaults);
 		$builder = $this->getContainerBuilder();
 
-		$templateFactory = $builder->getByType('Nette\Bridges\ApplicationLatte\ILatteFactory');
-		if (!$templateFactory) {
-			throw new InvalidStateException('Service implemented Nette\Bridges\ApplicationLatte\ILatteFactory not found.');
+		$templateFactory = $builder->getByType(ILatteFactory::class);
+		if ($templateFactory === null) {
+			throw new InvalidStateException(sprintf('Service which implements %s not found.', ILatteFactory::class));
 		}
 
 		$builder->getDefinition($templateFactory)

src/ParsedownExtraAdapter.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Contributte\Parsedown;
 
@@ -8,7 +8,6 @@
 /**
  * ParsedownExtra Adapter
  *
- * @author Milan Felix Sulc <[email protected]>
  * @method void onProcess(string $text, ParsedownExtraAdapter $adapter)
  */
 class ParsedownExtraAdapter
@@ -19,17 +18,15 @@ class ParsedownExtraAdapter
 	/** @var ParsedownExtra */
 	private $parsedown;
 
-	/** @var array */
+	/** @var callable[] */
 	public $onProcess = [];
 
 	/**
 	 * Creates adapter
-	 *
-	 * @param ParsedownExtra|NULL $parsedown
 	 */
-	public function __construct(ParsedownExtra $parsedown = NULL)
+	public function __construct(?ParsedownExtra $parsedown = null)
 	{
-		$this->parsedown = $parsedown ? $parsedown : new ParsedownExtra();
+		$this->parsedown = $parsedown ?: new ParsedownExtra();
 	}
 
 	/**
@@ -45,9 +42,8 @@ public function process($text)
 
 	/**
 	 * @param mixed $line
-	 * @return string
 	 */
-	public function processLine($line)
+	public function processLine($line): string
 	{
 		$this->onProcess($line, $this);
 

src/ParsedownFilter.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace Contributte\Parsedown;
 
@@ -11,20 +11,15 @@ class ParsedownFilter
 	/** @var ParsedownExtraAdapter */
 	protected $adapter;
 
-	/**
-	 * @param ParsedownExtraAdapter $adapter
-	 */
 	public function __construct(ParsedownExtraAdapter $adapter)
 	{
 		$this->adapter = $adapter;
 	}
 
 	/**
-	 * @param FilterInfo $info
 	 * @param mixed $text
-	 * @return Html
 	 */
-	public function apply(FilterInfo $info, $text)
+	public function apply(FilterInfo $info, $text): Html
 	{
 		return new Html($this->adapter->process($text));
 	}

tests/bootstrap.php

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 use Ninjify\Nunjuck\Environment;
 

tests/cases/DI/ParsedownExtraExtension.phpt

@@ -1,5 +1,4 @@
-<?php
-
+<?php declare(strict_types = 1);
 
 use Contributte\Parsedown\DI\ParsedownExtraExtension;
 use Nette\Bridges\ApplicationDI\LatteExtension;
@@ -12,11 +11,11 @@ use Tester\FileMock;
 
 require_once __DIR__ . '/../../bootstrap.php';
 
-test(function () {
-	$loader = new ContainerLoader(TEMP_DIR, TRUE);
-	$class = $loader->load(function (Compiler $compiler) {
-		$compiler->addExtension('console', new ParsedownExtraExtension());
+test(function (): void {
+	$loader = new ContainerLoader(TEMP_DIR, true);
+	$class = $loader->load(function (Compiler $compiler): void {
 		$compiler->addExtension('latte', new LatteExtension(TEMP_DIR));
+		$compiler->addExtension('parsedown', new ParsedownExtraExtension());
 		$compiler->loadConfig(FileMock::create('
 		services:
 			latte.latteFactory:
@@ -26,7 +25,7 @@ test(function () {
 	}, [microtime(), 1]);
 
 	/** @var Container $container */
-	$container = new $class;
+	$container = new $class();
 
 	$text = '
 {block|parsedown}

tests/cases/ParsedownExtraAdapter.phpt

@@ -1,11 +1,11 @@
-<?php
+<?php declare(strict_types = 1);
 
 use Contributte\Parsedown\ParsedownExtraAdapter;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-test(function () {
+test(function (): void {
 	$adapter = new ParsedownExtraAdapter();
 
 	$text = '

tests/cases/ParsedownFilter.phpt

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types = 1);
 
 use Contributte\Parsedown\ParsedownExtraAdapter;
 use Contributte\Parsedown\ParsedownFilter;
@@ -8,7 +8,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-test(function () {
+test(function (): void {
 	$adapter = new ParsedownExtraAdapter();
 	$latte = new Engine();
 	$latte->addFilter('parsedown', [new ParsedownFilter($adapter), 'apply']);