Merge pull request #1133 from greg0ire/ramsey-composer-install

Maintenance work

.doctrine-project.json

@@ -6,7 +6,7 @@
     "versions": [
         {
             "name": "2.2",
-            "branchName": "master",
+            "branchName": "2.2.x",
             "slug": "latest",
             "upcoming": true
         },

.github/ISSUE_TEMPLATE/BC_Break.md

@@ -4,7 +4,7 @@ about: Have you encountered an issue during upgrade? 💣
 ---
 
 <!--
-Before reporting a BC break, please consult the upgrading document to make sure it's not an expected change: https://github.com/doctrine/migrations/blob/master/UPGRADE.md
+Before reporting a BC break, please consult the upgrading document to make sure it's not an expected change: https://github.com/doctrine/migrations/blob/3.1.x/UPGRADE.md
 -->
 
 ### BC Break Report

.github/workflows/coding-standards.yml

@@ -5,11 +5,9 @@ on:
   pull_request:
     branches:
       - "*.x"
-      - "master"
   push:
     branches:
       - "*.x"
-      - "master"
 
 jobs:
   coding-standards:
@@ -32,15 +30,10 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           tools: "cs2pr"
 
-      - name: "Cache dependencies installed with Composer"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
-
       - name: "Install dependencies with Composer"
-        run: "composer install --no-interaction --no-progress --no-suggest"
+        uses: "ramsey/composer-install@v1"
+        with:
+          dependency-versions: "${{ matrix.dependencies }}"
 
       # https://github.com/doctrine/.github/issues/3
       - name: "Run PHP_CodeSniffer"

.github/workflows/continuous-integration.yml

@@ -20,10 +20,10 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
-        deps:
-          - "normal"
+        dependencies:
+          - "highest"
         include:
-          - deps: "low"
+          - deps: "lowest"
             php-version: "7.1"
 
     steps:
@@ -51,20 +51,10 @@ jobs:
       - name: "Download box"
         run: "./download-box.sh"
 
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v2"
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
         with:
-          path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
-
-      - name: "Install dependencies with composer"
-        run: "composer update --no-interaction --prefer-dist --no-progress"
-        if: "${{ matrix.deps == 'normal' }}"
-
-      - name: "Install lowest possible dependencies with composer"
-        run: "composer update --no-interaction --prefer-dist --prefer-lowest --no-progress"
-        if: "${{ matrix.deps == 'low' }}"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Run PHPUnit"
         run: "vendor/bin/phpunit --coverage-clover=coverage.xml"

.github/workflows/static-analysis.yml

@@ -5,11 +5,9 @@ on:
   pull_request:
     branches:
       - "*.x"
-      - "master"
   push:
     branches:
       - "*.x"
-      - "master"
 
 jobs:
   static-analysis-phpstan:
@@ -32,15 +30,10 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           extensions: "pdo_sqlite"
 
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v2"
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
         with:
-          path: "~/.composer/cache"
-          key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
-          restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
-
-      - name: "Install dependencies with composer"
-        run: "composer install --no-interaction --no-progress --no-suggest"
+          dependency-versions: "${{ matrix.dependencies }}"
 
       - name: "Run a static analysis with phpstan/phpstan"
         run: "vendor/bin/phpstan analyse"

README.md

@@ -1,10 +1,10 @@
 # Doctrine Migrations
 
 [![Build Status](https://travis-ci.org/doctrine/migrations.svg)](https://travis-ci.org/doctrine/migrations)
-[![Code Coverage](https://codecov.io/gh/doctrine/migrations/branch/master/graph/badge.svg)](https://codecov.io/gh/doctrine/migrations/branch/master)
+[![Code Coverage](https://codecov.io/gh/doctrine/migrations/branch/3.1.x/graph/badge.svg)](https://codecov.io/gh/doctrine/migrations/branch/3.1.x)
 [![Packagist Downloads](https://img.shields.io/packagist/dm/doctrine/migrations)](https://packagist.org/packages/doctrine/migrations)
 [![Packagist Version](https://img.shields.io/packagist/v/doctrine/migrations)](https://packagist.org/packages/doctrine/migrations)
-[![GitHub license](https://img.shields.io/github/license/doctrine/migrations)](https://github.com/doctrine/migrations/blob/master/LICENSE)
+[![GitHub license](https://img.shields.io/github/license/doctrine/migrations)](https://github.com/doctrine/migrations/blob/3.1.x/LICENSE)
 
 ## Documentation
 

composer.json

@@ -49,11 +49,6 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.2.x-dev"
-        }
-    },
     "bin": [
         "bin/doctrine-migrations"
     ]

tests/Doctrine/Migrations/Tests/Provider/_files/Doctrine.Migrations.Tests.Provider.A.dcm.xml

@@ -1,7 +1,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                   https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+   vendor/doctrine/orm/doctrine-mapping.xsd">
 
    <entity name="Doctrine\Migrations\Tests\Provider\A" table="a">
        <id name="id" type="integer" column="id">

tests/Doctrine/Migrations/Tests/Provider/_files/Doctrine.Migrations.Tests.Provider.C.dcm.xml

@@ -1,7 +1,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                   https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+   vendor/doctrine/orm/doctrine-mapping.xsd">
 
    <entity name="Doctrine\Migrations\Tests\Provider\C" table="c">
        <id name="id" type="integer" column="id">