Skip to content

Commit

Permalink
v73.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@gammamatrix
gammamatrix committed Jul 6, 2024
1 parent 320ea59 commit 7992a60
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 55 deletions.
127 changes: 76 additions & 51 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
echo "TIMESTAMP_START=$(date +'%s')" >> $GITHUB_OUTPUT
- name: "Slack notification: IN PROGRESS"
id: slack
uses: slackapi/slack-github-action@v1.25.0
uses: slackapi/slack-github-action@v1.26.0
with:
channel-id: 'C068A06PV43'
channel-id: "C068A06PV43"
payload: |
{
"text": "CI Build Status for playground-matrix-resource: IN PROGRESS\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}",
Expand All @@ -49,11 +49,11 @@ jobs:
"fields": [
{
"type": "mrkdwn",
"text": "*Start:*\n${{ steps.timer_start.outputs.DATE_START }}"
"text": "*Start:* <!date^${{ steps.timer_start.outputs.TIMESTAMP_START }}^{date} at {time}|${{ steps.timer_start.outputs.DATE_START }}>"
},
{
"type": "mrkdwn",
"text": "*End:*\n--"
"text": "*End:* --"
}
]
},
Expand All @@ -71,18 +71,25 @@ jobs:
]
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*PR:* ${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*Build:* ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
}
"type": "actions",
"elements": [
{
"type": "button",
"text": {
"type": "plain_text",
"text": "Merge/Pull Request"
},
"url": "${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
},
{
"type": "button",
"text": {
"type": "plain_text",
"text": "Build: ${{ github.run_id }}"
},
"url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
}
]
}
]
}
Expand All @@ -102,16 +109,16 @@ jobs:
version: "11.0"
php_version: "8.2"
php_extensions: intl xdebug
configuration: phpunit-ci.xml
coverage_clover: clover.xml
coverage_text: true
memory_limit: "256M"
- name: Make code coverage badge
uses: timkrase/[email protected]
with:
coverage_badge_path: output/coverage.svg
push_badge: false
- name: Git push to testing/develop branch
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
publish_dir: ./output
publish_branch: testing/develop
Expand All @@ -122,7 +129,8 @@ jobs:
with:
level: 9
php_version: "8.2"
path: config/ routes/ src/ tests/Feature/ resources/views/
path: config/ lang/ src/ tests/Feature/
args: --verbose --debug
- name: Stopping timer
if: ${{ !cancelled() }}
id: timer_end
Expand All @@ -131,10 +139,11 @@ jobs:
run: |
echo "DATE_END=$(date +'%Y-%m-%d %H:%M:%S')" >> $GITHUB_OUTPUT
echo "DURATION_PHRASE=$(($(date +'%s')-$TIMESTAMP_START)) seconds" >> $GITHUB_OUTPUT
echo "TIMESTAMP_END=$(date +'%s')" >> $GITHUB_OUTPUT
- name: "Slack notification: Done"
uses: slackapi/slack-github-action@v1.25.0
uses: slackapi/slack-github-action@v1.26.0
with:
channel-id: 'C068A06PV43'
channel-id: "C068A06PV43"
update-ts: ${{ steps.slack.outputs.ts }}
payload: |
{
Expand All @@ -152,11 +161,11 @@ jobs:
"fields": [
{
"type": "mrkdwn",
"text": "*Start:*\n${{ steps.timer_start.outputs.DATE_START }}"
"text": "*Start:* <!date^${{ steps.timer_start.outputs.TIMESTAMP_START }}^{date} at {time}|${{ steps.timer_start.outputs.DATE_START }}>"
},
{
"type": "mrkdwn",
"text": "*End:*\n${{ steps.timer_end.outputs.DATE_END }}"
"text": "*End:* <!date^${{ steps.timer_end.outputs.TIMESTAMP_END }}^{date} at {time}|${{ steps.timer_end.outputs.DATE_END }}>"
}
]
},
Expand All @@ -174,28 +183,36 @@ jobs:
]
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*PR:* ${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*Build:* ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
}
"type": "actions",
"elements": [
{
"type": "button",
"text": {
"type": "plain_text",
"text": "Merge/Pull Request"
},
"url": "${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
},
{
"type": "button",
"text": {
"type": "plain_text",
"text": "Build: ${{ github.run_id }}"
},
"style": "primary",
"url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
}
]
}
]
}
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
- name: "Send a notification for failures"
if: ${{ failure() }}
uses: slackapi/slack-github-action@v1.25.0
uses: slackapi/slack-github-action@v1.26.0
with:
channel-id: 'C068A06PV43'
channel-id: "C068A06PV43"
update-ts: ${{ steps.slack.outputs.ts }}
payload: |
{
Expand All @@ -213,11 +230,11 @@ jobs:
"fields": [
{
"type": "mrkdwn",
"text": "*Start:*\n${{ steps.timer_start.outputs.DATE_START }}"
"text": "*Start:* <!date^${{ steps.timer_start.outputs.TIMESTAMP_START }}^{date} at {time}|${{ steps.timer_start.outputs.DATE_START }}>"
},
{
"type": "mrkdwn",
"text": "*End:*\n${{ steps.timer_end.outputs.DATE_END }}"
"text": "*End:* <!date^${{ steps.timer_end.outputs.TIMESTAMP_END }}^{date} at {time}|${{ steps.timer_end.outputs.DATE_END }}>"
}
]
},
Expand All @@ -235,18 +252,26 @@ jobs:
]
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*PR:* ${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*Build:* ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
}
"type": "actions",
"elements": [
{
"type": "button",
"text": {
"type": "plain_text",
"text": "Merge/Pull Request"
},
"url": "${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
},
{
"type": "button",
"text": {
"type": "plain_text",
"text": "Build: ${{ github.run_id }}"
},
"style": "danger",
"url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
}
]
}
]
}
Expand Down
76 changes: 76 additions & 0 deletions phpunit-ci.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
stopOnSkipped="false"
backupGlobals="false"
beStrictAboutTestsThatDoNotTestAnything="true"
beStrictAboutOutputDuringTests="true"
cacheResult="false"
failOnRisky="true"
failOnWarning="true"
processIsolation="false"
stopOnError="true"
stopOnFailure="true"
cacheDirectory=".phpunit.cache"
backupStaticProperties="false"
displayDetailsOnIncompleteTests="true"
displayDetailsOnSkippedTests="true"
displayDetailsOnTestsThatTriggerDeprecations="true"
displayDetailsOnTestsThatTriggerErrors="true"
displayDetailsOnTestsThatTriggerNotices="true"
displayDetailsOnTestsThatTriggerWarnings="true"
testdox="true">
<testsuites>
<testsuite name="Unit">
<directory>tests/Unit</directory>
</testsuite>
<testsuite name="Feature">
<directory>tests/Feature</directory>
</testsuite>
</testsuites>
<coverage
includeUncoveredFiles="true"
pathCoverage="false"
ignoreDeprecatedCodeUnits="true"
disableCodeCoverageIgnore="true">
<report>
<clover outputFile="output/clover.xml" />
<cobertura outputFile="output/cobertura.xml" />
<crap4j outputFile="output/crap4j.xml" threshold="50" />
<!-- <html outputDirectory="output/html" lowUpperBound="50" highLowerBound="90"/> -->
<php outputFile="output/coverage.php" />
<text outputFile="output/coverage.txt" showUncoveredFiles="false" showOnlySummary="true" />
<!-- <xml outputDirectory="output/xml"/> -->
</report>
</coverage>
<logging>
<junit outputFile="output/junit.xml" />
<teamcity outputFile="output/teamcity.txt" />
<testdoxHtml outputFile="output/testdox.html" />
<testdoxText outputFile="output/testdox.txt" />
</logging>
<source>
<include>
<directory suffix=".php">src</directory>
</include>
</source>
<php>
<env name="APP_DEBUG" value="true" />
<env name="APP_ENV" value="testing" />
<env name="APP_KEY" value="base64:lNTGdmOOxP5uNUVuCj9FB//Ssn8JmRXBdtPEE4/QReE=" />
<env name="BCRYPT_ROUNDS" value="4" />
<env name="CACHE_DRIVER" value="array" />
<env name="DB_CONNECTION" value="sqlite" />
<env name="DB_DATABASE" value=":memory:" />
<env name="LOG_CHANNEL" value="stderr"/>
<env name="TEST_DB_MIGRATIONS" value="true" />
<env name="MAIL_MAILER" value="log" />
<env name="QUEUE_CONNECTION" value="sync" />
<env name="SESSION_DRIVER" value="array" />
<env name="TELESCOPE_ENABLED" value="false" />
<ini name="memory_limit" value="512M" />
</php>
</phpunit>
2 changes: 1 addition & 1 deletion phpunit.xml.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<env name="DB_CONNECTION" value="sqlite" />
<env name="DB_DATABASE" value=":memory:" />
<env name="LOG_CHANNEL" value="stderr"/>
<env name="TEST_DB_MIGRATIONS" value="true" />
<env name="TEST_DB_MIGRATIONS" value="false" />
<env name="MAIL_MAILER" value="log" />
<env name="QUEUE_CONNECTION" value="sync" />
<env name="SESSION_DRIVER" value="array" />
Expand Down
6 changes: 3 additions & 3 deletions src/Http/Requests/FormRequest.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

declare(strict_types=1);
/**
* Playground
*/

declare(strict_types=1);
namespace Playground\Matrix\Resource\Http\Requests;

use Illuminate\Contracts\Auth\Authenticatable;
Expand All @@ -12,7 +12,7 @@
/**
* \Playground\Matrix\Resource\Http\Requests\FormRequest
*/
abstract class FormRequest extends BaseFormRequest
class FormRequest extends BaseFormRequest
{
/**
* @var array<string, string|array<mixed>>
Expand Down

0 comments on commit 7992a60

Please sign in to comment.