Skip to content

Commit 2a0c334

Browse files
authored
Merge pull request #227 from doctrine/8.1.x
Merge 8.1.x into master
2 parents 28203e1 + 3cf6e3d commit 2a0c334

File tree

6 files changed

+18
-70
lines changed

6 files changed

+18
-70
lines changed

.doctrine-project.json

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,27 @@
44
"slug": "coding-standard",
55
"docsSlug": "doctrine-coding-standard",
66
"versions": [
7+
{
8+
"name": "8.1",
9+
"branchName": "8.1.x",
10+
"slug": "8.1",
11+
"current": true,
12+
"aliases": [
13+
"current",
14+
"stable"
15+
]
16+
},
717
{
818
"name": "8.0",
9-
"branchName": "master",
10-
"slug": "latest",
11-
"upcoming": true
19+
"branchName": "8.0.x",
20+
"slug": "8.0",
21+
"maintained": false
1222
},
1323
{
1424
"name": "7.0",
1525
"branchName": "7.0.x",
1626
"slug": "7.0",
17-
"current": true,
18-
"aliases": [
19-
"current",
20-
"stable"
21-
]
27+
"maintained": false
2228
},
2329
{
2430
"name": "6.0",

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
/.gitattributes export-ignore
44
/.github export-ignore
55
/.gitignore export-ignore
6-
/.travis.yml export-ignore
76
/docs/ export-ignore
87
/phpcs.xml.dist export-ignore
98
/tests/ export-ignore

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ jobs:
9090
strategy:
9191
matrix:
9292
php-version:
93+
- "7.1"
9394
- "7.2"
9495
- "7.3"
9596
- "7.4"
@@ -125,7 +126,7 @@ jobs:
125126
strategy:
126127
matrix:
127128
php-version:
128-
- "7.2"
129+
- "7.1"
129130
- "7.4"
130131

131132
steps:

.travis.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Doctrine Coding Standard
22

3-
[![Build Status](https://img.shields.io/travis/doctrine/coding-standard/master.svg?style=flat-square)](http://travis-ci.org/doctrine/coding-standard)
3+
[![Build Status](https://github.com/doctrine/coding-standard/workflows/Continuous%20Integration/badge.svg)](https://github.com/doctrine/coding-standard/actions?query=workflow%3A%22Continuous+Integration%22+)
44
[![Continuous Integration](https://github.com/doctrine/coding-standard/workflows/Continuous%20Integration/badge.svg?branch=master)](https://github.com/doctrine/coding-standard/actions)
55
[![Total Downloads](https://img.shields.io/packagist/dt/doctrine/coding-standard.svg?style=flat-square)](https://packagist.org/packages/doctrine/coding-standard)
66
[![Latest Stable Version](https://img.shields.io/packagist/v/doctrine/coding-standard.svg?style=flat-square)](https://packagist.org/packages/doctrine/coding-standard)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
{"name": "Steve Müller", "email": "[email protected]"}
2222
],
2323
"require": {
24-
"php": "^7.2 || ^8.0",
24+
"php": "^7.1 || ^8.0",
2525
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
2626
"slevomat/coding-standard": "^6.3.9",
2727
"squizlabs/php_codesniffer": "^3.5.5"

0 commit comments

Comments
 (0)