Skip to content
Merged

Release #1064

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ vue
.stylelintrc
webpack.config.js
docker-compose.yml
phpstan.neon
phpstan-baseline.neon
92 changes: 43 additions & 49 deletions .github/workflows/test-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,26 @@ concurrency:
on:
push:
branches-ignore:
- 'master'
- "master"

jobs:
code-sniff:
name: PHP Lint
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v2
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
- name: Checkout source code
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "7.4"
tools: phpcs, phpcbf
- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Setup Composer cache
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- name: Run Composer Install
run: composer install --prefer-dist --no-progress --quiet
continue-on-error: true
- name: Run PHPCS
run: composer run lint
continue-on-error: false

- name: Run Composer Install
run: composer install --prefer-dist --no-progress --quiet
continue-on-error: true
- name: Run PHPCS
run: composer run lint
continue-on-error: false

php-unit:
name: PHPUnit
Expand All @@ -49,30 +37,36 @@ jobs:
env:
MYSQL_ROOT_PASSWORD: root
ports:
- 3306/tcp
- 3306/tcp
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- name: Checkout source code
uses: actions/checkout@v2
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
- name: Checkout source code
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "7.4"
tools: phpunit-polyfills
- name: Install WordPress Test Suite
run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1:${{ job.services.mysql.ports['3306'] }}
- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Setup Composer cache
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-composer-
- name: Install composer
run: composer install --prefer-dist --no-progress
- name: Run PHP Unit
run: composer run test
- name: Install WordPress Test Suite
run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1:${{ job.services.mysql.ports['3306'] }}
- name: Install composer
run: composer install --prefer-dist --no-progress
- name: Run PHP Unit
run: composer run test

phpstan:
name: PHPStan
runs-on: ubuntu-latest
steps:
- name: Setup PHP version
uses: shivammathur/setup-php@v2
with:
php-version: "7.4"
extensions: simplexml
- name: Checkout source code
uses: actions/checkout@v4
- name: Install composer
run: |
composer install --prefer-dist --no-progress
- name: Run phpstan
run: composer run phpstan
7 changes: 6 additions & 1 deletion assets/css/rop_core.css
Original file line number Diff line number Diff line change
Expand Up @@ -3045,6 +3045,11 @@ a.active {
-webkit-flex: 0 0 auto;
-ms-flex: 0 0 auto;
flex: 0 0 auto;
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 0.05rem solid #e7e9ed;
margin: 8px;
}

#rop_core .panel .panel-body {
Expand Down Expand Up @@ -3213,7 +3218,6 @@ a.active {
display: flex;
display: -ms-flexbox;
margin: 0.2rem 0 0.15rem;
border-bottom: 0.05rem solid #e7e9ed;
list-style: none;

-webkit-align-items: center;
Expand All @@ -3223,6 +3227,7 @@ a.active {
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
margin-bottom: 0px;
}

#rop_core .tab .tab-item {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/build/dashboard.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/react/build/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-editor', 'wp-element', 'wp-notices', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => 'eb694ccc60bb285f9067');
<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-editor', 'wp-element', 'wp-notices', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '3000d00121986d2a4045');
2 changes: 1 addition & 1 deletion assets/js/react/build/index.js

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
"build": "sh bin/dist.sh",
"test": "vendor/bin/phpunit",
"lint": "vendor/bin/phpcs --standard=phpcs.xml --extensions=php -s",
"format": "vendor/bin/phpcbf --standard=phpcs.xml --report-summary --report-source"
"format": "vendor/bin/phpcbf --standard=phpcs.xml --report-summary --report-source",
"phpstan": "phpstan",
"phpstan:generate:baseline": "phpstan --generate-baseline"
},
"autoload": {
"files": [
Expand Down Expand Up @@ -54,7 +56,9 @@
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"phpunit/phpunit": "9.*",
"yoast/phpunit-polyfills": "^2.0",
"codeinwp/phpcs-ruleset": "dev-main"
"codeinwp/phpcs-ruleset": "dev-main",
"phpstan/phpstan": "^2.1",
"szepeviktor/phpstan-wordpress": "^2.0"
},
"config": {
"allow-plugins": {
Expand Down
Loading
Loading