Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more strict php requirement #314

Open
wants to merge 2 commits into
base: 1.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 2 additions & 12 deletions .github/workflows/auto-regenerate.yml
Expand Up @@ -20,17 +20,8 @@ jobs:
coverage: "pcov"
php-version: "7.4"

- name: "Check out salathe/phpdoc-base"
uses: "actions/checkout@v2"
with:
path: "generator/doc/doc-en/doc-base"
repository: "salathe/phpdoc-base"

- name: "Check out php/doc-en"
uses: "actions/checkout@v2"
with:
path: "generator/doc/doc-en/en"
repository: "php/doc-en"
- name: "Check out submodules"
run: "git submodule init"

- name: "Install dependencies with composer in generator/ directory"
run: "composer install --no-interaction"
Expand Down Expand Up @@ -72,4 +63,3 @@ jobs:
assignees: "kharhamel, moufmouf"



14 changes: 2 additions & 12 deletions .github/workflows/continuous-integration.yml
Expand Up @@ -40,19 +40,9 @@ jobs:
path: "generator/doc/doc-en"
key: "php-doc"

- name: "Check out salathe/phpdoc-base"
uses: "actions/checkout@v2"
if: steps.cache-php-doc.outputs.cache-hit != 'true'
with:
path: "generator/doc/doc-en/doc-base"
repository: "salathe/phpdoc-base"

- name: "Check out php/doc-en"
uses: "actions/checkout@v2"
- name: "Check out submodules"
if: steps.cache-php-doc.outputs.cache-hit != 'true'
with:
path: "generator/doc/doc-en/en"
repository: "php/doc-en"
run: "git submodule init"

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v1"
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Expand Up @@ -103,7 +103,7 @@
]
},
"require": {
"php": ">=7.2"
"php": "^7.2"
},
"require-dev": {
"phpstan/phpstan": "^0.12",
Expand All @@ -120,4 +120,4 @@
"dev-master": "0.1-dev"
}
}
}
}