Skip to content

Commit

Permalink
Merge pull request #144 from iMattPro/updates
Browse files Browse the repository at this point in the history 
Version constraint updates
  • Loading branch information
@iMattPro
iMattPro authored Jun 12, 2024
2 parents e9cf1b6 + 89b7bbf commit d13a6f1
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 28 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
jobs:
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
basic-checks:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand All @@ -33,14 +33,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:

# START MySQL and MariaDB Job
mysql-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -156,14 +156,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:

# START PostgreSQL Job
postgres-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -301,14 +301,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

Expand Down Expand Up @@ -354,7 +354,7 @@ jobs:

# START Other Tests Job (SQLite 3 and mssql)
other-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -396,14 +396,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "phpbb-extension",
"description": "The official phpBB skeleton extension generator.",
"homepage": "https://www.phpbb.com/customise/db/official_tool/ext_skeleton/",
"version": "1.1.11",
"version": "1.1.12-dev",
"license": "GPL-2.0-only",
"authors": [
{
Expand All @@ -28,7 +28,7 @@
"extra": {
"display-name": "phpBB Skeleton Extension",
"soft-require": {
"phpbb/phpbb": ">=3.2.3"
"phpbb/phpbb": ">=3.2.3,<4.0.0@dev"
},
"version-check": {
"host": "www.phpbb.com",
Expand Down
7 changes: 6 additions & 1 deletion ext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ protected function phpbb_requirement()
{
if (phpbb_version_compare(PHPBB_VERSION, '3.2.3', '<'))
{
$this->errors[] = 'PHPBB_VERSION_ERROR';
$this->errors[] = 'PHPBB_VERSION_MIN_ERROR';
}

else if (phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='))
{
$this->errors[] = 'PHPBB_VERSION_MAX_ERROR';
}
}

Expand Down
3 changes: 2 additions & 1 deletion language/en/common.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,6 @@

'NO_ZIPARCHIVE_ERROR' => 'The ZipArchive class is required, but was not found in your PHP configuration.',
'PHP_VERSION_ERROR' => 'PHP 5.6 or newer is required to use this extension.',
'PHPBB_VERSION_ERROR' => 'phpBB 3.2.3 or newer is required to use this extension.',
'PHPBB_VERSION_MIN_ERROR' => 'phpBB 3.2.3 or newer is required to use this extension.',
'PHPBB_VERSION_MAX_ERROR' => 'phpBB 4 is not supported with this version of the extension. Please check for a newer version of this extension.'
]);
24 changes: 12 additions & 12 deletions skeleton/.github/workflows/tests.yml.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
jobs:
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
basic-checks:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand All @@ -35,14 +35,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ '{{' }} env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ '{{' }} env.EXTNAME }}

Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

# START MySQL and MariaDB Job
mysql-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -156,14 +156,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ '{{' }} env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ '{{' }} env.EXTNAME }}

Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:

# START PostgreSQL Job
postgres-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -270,14 +270,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ '{{' }} env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ '{{' }} env.EXTNAME }}

Expand Down Expand Up @@ -323,7 +323,7 @@ jobs:

# START Other Tests Job (SQLite 3 and mssql)
other-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -365,14 +365,14 @@ jobs:

steps:
- name: Checkout phpBB
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: phpbb/phpbb
ref: ${{ '{{' }} env.PHPBB_BRANCH }}
path: phpBB3

- name: Checkout extension
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: phpBB3/phpBB/ext/${{ '{{' }} env.EXTNAME }}

Expand Down

0 comments on commit d13a6f1

Please sign in to comment.