Merge pull request #82 from laminas/2.12.x-merge-up-into-3.0.x_aLnWvS4q

Merge release 2.12.1 into 3.0.x

.github/workflows/continuous-integration.yml

@@ -0,0 +1,32 @@
+name: "Continuous Integration"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - '[0-9]+.[0-9]+.x'
+      - 'refs/pull/*'
+
+jobs:
+  matrix:
+    name: Generate job matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
+    steps:
+      - name: Gather CI configuration
+        id: matrix
+        uses: laminas/laminas-ci-matrix-action@v1
+
+  qa:
+    name: QA Checks
+    needs: [matrix]
+    runs-on: ${{ matrix.operatingSystem }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
+    steps:
+      - name: ${{ matrix.name }}
+        uses: laminas/laminas-continuous-integration-action@v1
+        with:
+          job: ${{ matrix.job }}

.gitignore

@@ -1,5 +1,4 @@
 /clover.xml
-/composer.lock
 /coveralls-upload.json
 /docs/html/
 /laminas-mkdoc-theme.tgz

CHANGELOG.md

@@ -2,6 +2,41 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.12.1 - 2021-10-12
+
+
+-----
+
+### Release Notes for [2.12.1](https://github.com/laminas/laminas-view/milestone/6)
+
+
+
+### 2.12.1
+
+- Total issues resolved: **1**
+- Total pull requests resolved: **7**
+- Total contributors: **3**
+
+#### Bug,Documentation
+
+ - [78: Fix Markdown Formatting for CI Round 2](https://github.com/laminas/laminas-view/pull/78) thanks to @gsteel and @Ocramius
+
+ - [74: Correctly attach Json Strategy.](https://github.com/laminas/laminas-view/pull/74) thanks to @nafetsrybak
+
+#### Bug
+
+ - [70: Update Composer lock file and fix test failures](https://github.com/laminas/laminas-view/pull/70) thanks to @gsteel
+ - [66: Missing dev dependencies causing tests to fail](https://github.com/laminas/laminas-view/pull/66) thanks to @gsteel
+
+#### Bug,Enhancement
+
+ - [69: Fix CI pipeline according to newer test dependency requirements](https://github.com/laminas/laminas-view/pull/69) thanks to @Ocramius
+
+#### Enhancement
+
+ - [67: Switch to GHA CI Setup](https://github.com/laminas/laminas-view/pull/67) thanks to @gsteel
+ - [64: Fix tests without assertions](https://github.com/laminas/laminas-view/pull/64) thanks to @gsteel
+
 ## 2.12.0 - 2021-01-01
 
 ### Added

README.md

@@ -1,7 +1,6 @@
 # laminas-view
 
-[![Build Status](https://travis-ci.com/laminas/laminas-view.svg?branch=master)](https://travis-ci.com/laminas/laminas-view)
-[![Coverage Status](https://coveralls.io/repos/github/laminas/laminas-view/badge.svg?branch=master)](https://coveralls.io/github/laminas/laminas-view?branch=master)
+[![Build Status](https://github.com/laminas/laminas-view/workflows/Continuous%20Integration/badge.svg)](https://github.com/laminas/laminas-view/actions?query=workflow%3A"Continuous+Integration")
 
 laminas-view provides the “View” layer of the Laminas MVC system. It is a
 multi-tiered system allowing a variety of mechanisms for extension,
@@ -21,6 +20,6 @@ Browse the documentation online at https://docs.laminas.dev/laminas-view/
 
 ## Support
 
-* [Issues](https://github.com/laminas/laminas-view/issues/)
-* [Chat](https://laminas.dev/chat/)
-* [Forum](https://discourse.laminas.dev/)
+- [Issues](https://github.com/laminas/laminas-view/issues/)
+- [Chat](https://laminas.dev/chat/)
+- [Forum](https://discourse.laminas.dev/)

composer.json

@@ -40,20 +40,23 @@
         "laminas/laminas-log": "^2.7",
         "laminas/laminas-modulemanager": "^2.7.1",
         "laminas/laminas-mvc": "^2.7.14 || ^3.0",
-        "laminas/laminas-navigation": "^2.5",
+        "laminas/laminas-mvc-i18n": "^1.1",
+        "laminas/laminas-mvc-plugin-flashmessenger": "^1.2",
+        "laminas/laminas-navigation": "^2.8.1",
         "laminas/laminas-paginator": "^2.5",
         "laminas/laminas-permissions-acl": "^2.6",
         "laminas/laminas-router": "^3.0.1",
         "laminas/laminas-serializer": "^2.6.1",
         "laminas/laminas-servicemanager": "^3.3",
         "laminas/laminas-session": "^2.8.1",
         "laminas/laminas-uri": "^2.5",
-        "phpspec/prophecy-phpunit": "^2.0",
         "phpspec/prophecy": "^1.12",
+        "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.3"
     },
     "conflict": {
-        "laminas/laminas-servicemanager": "<3.3"
+        "laminas/laminas-servicemanager": "<3.3",
+        "laminas/laminas-router": "<3.0.1"
     },
     "suggest": {
         "laminas/laminas-authentication": "Laminas\\Authentication component",