Merge ca5537e into 6927092

codeigniter4 · Sep 8, 2021 · 5ef92a2 · 5ef92a2
2 parents 6927092 + ca5537e
commit 5ef92a2
Show file tree

Hide file tree

Showing 96 changed files with 5,579 additions and 830 deletions.
diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
@@ -0,0 +1,75 @@
+# When a PR is opened or a push is made, perform an
+# architectural inspection on the code using Deptrac.
+name: Deptrac
+
+on:
+  pull_request:
+    branches:
+      - 'develop'
+      - '4.*'
+    paths:
+      - 'app/**'
+      - 'system/**'
+      - 'composer.json'
+      - 'depfile.yaml'
+      - '.github/workflows/test-deptrac.yml'
+  push:
+    branches:
+      - 'develop'
+      - '4.*'
+    paths:
+      - 'app/**'
+      - 'system/**'
+      - 'composer.json'
+      - 'depfile.yaml'
+      - '.github/workflows/test-deptrac.yml'
+
+jobs:
+  build:
+    name: Architectural Inspection
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          tools: composer, phive
+          extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3
+
+      - name: Validate composer.json
+        run: composer validate --strict
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Create composer cache directory
+        run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Create Deptrac cache directory
+        run: mkdir -p build/
+
+      - name: Cache Deptrac results
+        uses: actions/cache@v2
+        with:
+          path: build
+          key: ${{ runner.os }}-deptrac-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-deptrac-
+
+      - name: Install dependencies
+        run: composer update --ansi --no-interaction
+
+      - name: Run architectural inspection
+        run: |
+            sudo phive --no-progress install --global qossmic/deptrac --trust-gpg-keys B8F640134AB1782E
+            deptrac analyze --cache-file=build/deptrac.cache
diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
@@ -40,4 +40,4 @@ jobs:
       - name: Detect code duplication
         run: |
             sudo phive --no-progress install --global --trust-gpg-keys 4AA394086372C20A phpcpd 
-            phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php app/ public/ system/
+            phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php --exclude system/Database/SQLSRV/Forge.php app/ public/ system/
diff --git a/admin/css/debug-toolbar/_graphic-charter.scss b/admin/css/debug-toolbar/_graphic-charter.scss
@@ -2,19 +2,19 @@
 // ========================================================================== */
 
 // Themes
-$t-dark: #252525;
+$t-dark:  #252525;
 $t-light: #FFFFFF;
 
 // Glossy colors
-$g-blue: #5BC0DE;
-$g-gray: #434343;
-$g-green: #9ACE25;
+$g-blue:   #5BC0DE;
+$g-gray:   #434343;
+$g-green:  #9ACE25;
 $g-orange: #DD8615;
-$g-red: #DD4814;
+$g-red:    #DD4814;
 
 // Matt colors
-$m-blue: #D8EAF0;
-$m-gray: #DFDFDF;
-$m-green: #DFF0D8;
+$m-blue:   #D8EAF0;
+$m-gray:   #DFDFDF;
+$m-green:  #DFF0D8;
 $m-orange: #FDC894;
-$m-red: #EF9090;
+$m-red:    #EF9090;
diff --git a/admin/css/debug-toolbar/_mixins.scss b/admin/css/debug-toolbar/_mixins.scss
@@ -2,12 +2,13 @@
 // ========================================================================== */
 
 @mixin border-radius($radius) {
-					border-radius: $radius;
-		 -moz-border-radius: $radius;
-	-webkit-border-radius: $radius;
+            border-radius: $radius;
+       -moz-border-radius: $radius;
+    -webkit-border-radius: $radius;
 }
+
 @mixin box-shadow($left, $top, $radius, $color) {
-					box-shadow: $left $top $radius $color;
-		 -moz-box-shadow: $left $top $radius $color;
-	-webkit-box-shadow: $left $top $radius $color;
+            box-shadow: $left $top $radius $color;
+       -moz-box-shadow: $left $top $radius $color;
+    -webkit-box-shadow: $left $top $radius $color;
 }