Merge branch 'release/0.6.0'

.travis.yml

@@ -1,8 +1,7 @@
 language: php
 php:
-  - 5.6
-  - hhvm
-  - 7
+  - 7.2
+  - 7.3
 before_script:
   - composer self-update
   - composer install

CHANGES.md → CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.6.0] - 2019-07-17
+### Changed
+- everything
+- now geared towards expressive or similar and uses zend expressive flash
+
 ## [0.3.0] - 2016-02-10
 ### Changed
 - minor internal refactor in `SessionHandler`
@@ -14,7 +19,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [0.1.0] - 2016-01-31
 - Initial Release
 
-[Unreleased]: https://github.com/jnjxp/jnjxp.molniya/compare/0.3.0...develop
+[Unreleased]: https://github.com/jnjxp/jnjxp.molniya/compare/0.6.0...develop
+[0.6.0]: https://github.com/jnjxp/jnjxp.molniya/compare/0.6.0...0.3.0
 [0.3.0]: https://github.com/jnjxp/jnjxp.molniya/compare/0.2.0...0.3.0
 [0.2.0]: https://github.com/jnjxp/jnjxp.molniya/compare/0.1.0...0.2.0
 [0.1.0]: https://github.com/jnjxp/jnjxp.molniya/releases/tag/0.1.0

README.md

@@ -1,6 +1,5 @@
 # jnjxp.molniya
-Session handler middleware with a simple flash messenger wrapped around
-[Aura\Session]
+Middleware to make [Zend\Expressive\Flash] messages available in [Zend\Expressive\Template]
 
 [![Latest version][ico-version]][link-packagist]
 [![Build Status][ico-travis]][link-travis]
@@ -13,9 +12,15 @@ composer require jnjxp/molniya
 ```
 
 ## Usage
+Add `Jnjxp\Molniya\MessageMiddleware` to your pipeline after the session and
+flash middleware.
 
+Output `$messages` in your view script. e.g. `<?= $messages ?? ''; ?>`
 
-[Aura\Session]: https://github.com/auraphp/Aura.Session
+
+
+[Zend\Expressive\Flash]: https://github.com/zendframework/zend-expressive-flash
+[Zend\Expressive\Template]: https://github.com/zendframework/zend-expressive-template
 
 [ico-version]: https://img.shields.io/packagist/v/jnjxp/molniya.svg?style=flat-square
 [ico-travis]: https://img.shields.io/travis/jnjxp/jnjxp.molniya/master.svg?style=flat-square

VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

composer.json

@@ -1,26 +1,43 @@
 {
     "name": "jnjxp/molniya",
-    "description": "Simple flash messenger and session middleware",
+    "description": "Simple middleware and helper for flash messages",
     "homepage":"https://github.com/jnjxp/jnjxp.molniya",
-    "license": "AGPL",
+    "license": "MIT",
     "authors": [
         {
             "name": "jake johns",
             "email": "jake@jakejohns.net"
         }
     ],
+    "config": {
+        "sort-packages": true
+    },
     "require": {
-        "aura/session": "^2.0",
+        "php": "^7.1",
         "psr/http-message": "^1.0",
-        "vperyod/session-handler": "^0.3.0"
+        "zendframework/zend-expressive-flash": "^1.0",
+        "zendframework/zend-expressive-template": "^2.0"
     },
     "require-dev":{
-        "zendframework/zend-diactoros": "~1.0",
-        "phpstan/phpstan": "^0.8.5"
+        "pds/skeleton": "^1.0",
+        "phpunit/phpunit": "^8.2",
+        "zendframework/zend-diactoros": "~1.0"
     },
     "autoload": {
         "psr-4": {
             "Jnjxp\\Molniya\\": "src/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Jnjxp\\Molniya\\": "tests/"
+        }
+    },
+    "extra": {
+        "zf": {
+            "config-provider": [
+                "Jnjxp\\Molniya\\ConfigProvider"
+            ]
+        }
     }
 }

phpcs.xml.dist

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ruleset name="Zend Framework Coding Standard">
+    <description>Zend Framework Coding Standard</description>
+
+    <!-- display progress -->
+    <arg value="p"/>
+    <arg name="colors"/>
+
+    <!-- inherit rules from: -->
+    <rule ref="PSR2"/>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.Formatting.SpaceAfterNot"/>
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
+        <properties>
+            <property name="ignoreBlankLines" value="false"/>
+        </properties>
+    </rule>
+</ruleset>

phpunit.xml.dist

@@ -1,12 +1,17 @@
-<phpunit bootstrap="./phpunit.php">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
     <testsuites>
-        <testsuite>
+        <testsuite name="jnjxp-molniya">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
+
     <filter>
-      <whitelist processUncoveredFilesFromWhitelist="true">
-        <directory suffix=".php">./src</directory>
-      </whitelist>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
     </filter>
 </phpunit>

src/ConfigProvider.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Jnjxp\Molniya;
+
+class ConfigProvider
+{
+    public function __invoke() : array
+    {
+        return [
+            'dependencies' => [
+                'factories'  => [
+                    MessageMiddleware::class => MessageMiddlewareFactory::class
+                ],
+            ]
+        ];
+    }
+}