Skip to content

Commit 9aabca6

Browse files
MGatnerMGatner
authored
Merge pull request #29 from tattersoftware/retool
Update Toolkit
2 parents 485f487 + a2020a6 commit 9aabca6

File tree

14 files changed

+340
-229
lines changed

14 files changed

+340
-229
lines changed

‎.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
; This file is for unifying the coding style for different editors and IDEs.
2+
; More information at http://editorconfig.org
3+
4+
root = true
5+
6+
[*]
7+
charset = utf-8
8+
indent_size = 4
9+
indent_style = space
10+
end_of_line = lf
11+
insert_final_newline = true
12+
trim_trailing_whitespace = true
13+
14+
[*.{yml,yaml}]
15+
indent_size = 2

‎.github/workflows/deptrac.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161

6262
- name: Install dependencies
6363
run: |
64-
composer -q config -g github-oauth.github.com "${{ secrets.GITHUB_TOKEN }}"
6564
if [ -f composer.lock ]; then
6665
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
6766
else

‎.github/workflows/infection.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ jobs:
5757

5858
- name: Install dependencies
5959
run: |
60-
composer -q config -g github-oauth.github.com "${{ secrets.GITHUB_TOKEN }}"
6160
if [ -f composer.lock ]; then
6261
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
6362
else

‎.github/workflows/phpcsfixer.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050

5151
- name: Install dependencies
5252
run: |
53-
composer -q config -g github-oauth.github.com "${{ secrets.GITHUB_TOKEN }}"
5453
if [ -f composer.lock ]; then
5554
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
5655
else

‎.github/workflows/phpstan.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565

6666
- name: Install dependencies
6767
run: |
68-
composer -q config -g github-oauth.github.com "${{ secrets.GITHUB_TOKEN }}"
6968
if [ -f composer.lock ]; then
7069
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
7170
else

‎.github/workflows/phpunit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454

5555
- name: Install dependencies
5656
run: |
57-
composer -q config -g github-oauth.github.com "${{ secrets.GITHUB_TOKEN }}"
5857
if [ -f composer.lock ]; then
5958
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
6059
else

‎.github/workflows/psalm.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Psalm
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- develop
7+
paths:
8+
- '**.php'
9+
- 'composer.*'
10+
- 'psalm*'
11+
- '.github/workflows/psalm.yml'
12+
push:
13+
branches:
14+
- develop
15+
paths:
16+
- '**.php'
17+
- 'composer.*'
18+
- 'psalm*'
19+
- '.github/workflows/psalm.yml'
20+
21+
jobs:
22+
build:
23+
name: Psalm Analysis
24+
runs-on: ubuntu-latest
25+
if: "!contains(github.event.head_commit.message, '[ci skip]')"
26+
27+
steps:
28+
- name: Checkout
29+
uses: actions/checkout@v3
30+
31+
- name: Setup PHP
32+
uses: shivammathur/setup-php@v2
33+
with:
34+
php-version: '8.0'
35+
tools: phpstan, phpunit
36+
extensions: intl, json, mbstring, xml
37+
coverage: none
38+
env:
39+
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
41+
- name: Get composer cache directory
42+
id: composer-cache
43+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
44+
45+
- name: Cache composer dependencies
46+
uses: actions/cache@v3
47+
with:
48+
path: ${{ steps.composer-cache.outputs.dir }}
49+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
50+
restore-keys: ${{ runner.os }}-composer-
51+
52+
- name: Create Psalm cache directory
53+
run: mkdir -p build/psalm
54+
55+
- name: Cache Psalm results
56+
uses: actions/cache@v3
57+
with:
58+
path: build/psalm
59+
key: ${{ runner.os }}-psalm-${{ github.sha }}
60+
restore-keys: ${{ runner.os }}-psalm-
61+
62+
- name: Install dependencies
63+
run: |
64+
if [ -f composer.lock ]; then
65+
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
66+
else
67+
composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
68+
fi
69+
70+
- name: Run Psalm analysis
71+
run: vendor/bin/psalm

‎.github/workflows/rector.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ jobs:
5555

5656
- name: Install dependencies
5757
run: |
58-
composer -q config -g github-oauth.github.com "${{ secrets.GITHUB_TOKEN }}"
5958
if [ -f composer.lock ]; then
6059
composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
6160
else

‎composer.json

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"name": "tatter/frontend",
3-
"type": "library",
43
"description": "Opinionated suite of frontend tech for CodeIgniter 4",
4+
"license": "MIT",
5+
"type": "library",
56
"keywords": [
67
"codeigniter",
78
"codeigniter4",
@@ -11,8 +12,6 @@
1112
"javascript",
1213
"css"
1314
],
14-
"homepage": "https://github.com/tattersoftware/codeigniter4-frontend",
15-
"license": "MIT",
1615
"authors": [
1716
{
1817
"name": "Matthew Gatner",
@@ -21,6 +20,7 @@
2120
"role": "Developer"
2221
}
2322
],
23+
"homepage": "https://github.com/tattersoftware/codeigniter4-frontend",
2424
"require": {
2525
"php": "^7.4 || ^8.0",
2626
"almasaeed2010/adminlte": "^3.0",
@@ -39,11 +39,18 @@
3939
"codeigniter4/framework": "^4.1",
4040
"tatter/tools": "^2.0"
4141
},
42-
"config": {
43-
"allow-plugins": {
44-
"phpstan/extension-installer": true
42+
"repositories": [
43+
{
44+
"type": "vcs",
45+
"url": "https://github.com/DataTables/Dist-DataTables-Bootstrap4.git"
46+
},
47+
{
48+
"type": "composer",
49+
"url": "https://asset-packagist.org"
4550
}
46-
},
51+
],
52+
"minimum-stability": "dev",
53+
"prefer-stable": true,
4754
"autoload": {
4855
"psr-4": {
4956
"Tatter\\Frontend\\": "src"
@@ -57,20 +64,16 @@
5764
"Tests\\Support\\": "tests/_support"
5865
}
5966
},
60-
"repositories": [
61-
{
62-
"type": "vcs",
63-
"url": "https://github.com/DataTables/Dist-DataTables-Bootstrap4.git"
64-
},
65-
{
66-
"type": "composer",
67-
"url": "https://asset-packagist.org"
67+
"config": {
68+
"allow-plugins": {
69+
"phpstan/extension-installer": true
6870
}
69-
],
70-
"minimum-stability": "dev",
71-
"prefer-stable": true,
71+
},
7272
"scripts": {
73-
"analyze": "phpstan analyze",
73+
"analyze": [
74+
"phpstan analyze",
75+
"psalm"
76+
],
7477
"ci": [
7578
"Composer\\Config::disableProcessTimeout",
7679
"@deduplicate",

‎depfile.yaml

Lines changed: 0 additions & 156 deletions
This file was deleted.

0 commit comments

Comments
 (0)