Merge pull request #11 from tattersoftware/tools

Bugfix strict database

Author: MGatner

.github/workflows/analyze.yml

@@ -40,6 +40,8 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           tools: composer, pecl, phpunit
           extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
         id: composer-cache
@@ -65,7 +67,12 @@ jobs:
           key: ${{ runner.os }}-phpstan-${{ github.sha }}
           restore-keys: ${{ runner.os }}-phpstan-
 
-      - name: Install dependencies
+      - name: Install dependencies (limited)
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
+        run: composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
+
+      - name: Install dependencies (authenticated)
+        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
         run: composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
         env:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}

.github/workflows/compare.yml

@@ -0,0 +1,29 @@
+# When a PR is opened or a push is made, compare
+# code for backwards compatibility.
+name: RoaveBC
+
+on:
+  pull_request:
+    branches:
+      - develop
+    paths:
+      - 'src/**'
+
+jobs:
+  compare:
+    name: Compare for Backwards Compatibility
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Run comparison (limited)
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
+        uses: docker://nyholm/roave-bc-check-ga
+
+      - name: Run comparison (authenticated)
+        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
+        uses: docker://nyholm/roave-bc-check-ga
+        env:
+          COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}

.github/workflows/test.yml

@@ -31,6 +31,8 @@ jobs:
           tools: composer, pecl, phpunit
           extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3
           coverage: xdebug
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
         id: composer-cache
@@ -43,7 +45,12 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Install dependencies
+      - name: Install dependencies (limited)
+        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
+        run: composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
+
+      - name: Install dependencies (authenticated)
+        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}
         run: composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
         env:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}

composer.json

@@ -24,7 +24,7 @@
 	},
 	"require-dev": {
 		"codeigniter4/codeigniter4": "dev-develop",
-		"tatter/tools": "^1.7"
+		"tatter/tools": "^1.8"
 	},
 	"autoload": {
 		"psr-4": {

phpstan.neon.dist

@@ -12,6 +12,7 @@ parameters:
 	ignoreErrors:
 	universalObjectCratesClasses:
 		- CodeIgniter\Entity
+		- CodeIgniter\Entity\Entity
 		- Faker\Generator
 	scanDirectories:
 		- vendor/codeigniter4/codeigniter4/system/Helpers

phpunit.xml.dist

@@ -55,6 +55,9 @@
 					<element key="precision">
 						<integer>2</integer>
 					</element>
+					<element key="collectBare">
+						<boolean>true</boolean>
+					</element>
 					<element key="tabulate">
 						<boolean>true</boolean>
 					</element>
@@ -86,6 +89,7 @@
 		<env name="COMPOSER_DISABLE_XDEBUG_WARN" value="1"/>
 
 		<!-- Database configuration -->
+		<env name="database.tests.strictOn" value="true"/>
 		<!-- Uncomment to use alternate testing database configuration
 		<env name="database.tests.hostname" value="localhost"/>
 		<env name="database.tests.database" value="tests"/>

roave-bc-check.yaml

@@ -0,0 +1,3 @@
+parameters:
+    ignoreErrors:
+        - '#\[BC\] SKIPPED: .+ could not be found in the located source#'

src/Audits.php

@@ -34,12 +34,14 @@ public function __construct(AuditsConfig $config)
 	 * Checks the session for a logged in user based on config
 	 *
 	 * @return int  The current user ID, 0 for "not logged in", -1 for CLI
+	 *
+	 * @deprecated This will be removed in the next major release; use codeigniter4/authentication-implementation
 	 */
 	public function sessionUserId(): int
 	{
 		if (is_cli())
 		{
-			return -1;
+			return 0;
 		}
 
 		return session($this->config->sessionUserId) ?? 0;

tests/_support/DatabaseTestCase.php

@@ -70,17 +70,22 @@ public function seeAudit(array $values)
 		// Check each audit in the queue for a match
 		foreach ($queue as $audit)
 		{
+			$found = true;
+
 			// Check each value against the audit
 			foreach ($values as $key => $value)
 			{
 				if ($audit[$key] != $value)
 				{
-					break 2;
+					$found = false;
+					break;
 				}
 			}
 
-			$found = true;
-			break;
+			if ($found)
+			{
+				break;
+			}
 		}
 
 		$this->assertTrue($found, 'Audit not found in queue: ' . print_r($values, true));

tests/unit/TraitTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use Tests\Support\DatabaseTestCase;
+use Tests\Support\Models\WidgetModel;
 
 class TraitTest extends DatabaseTestCase
 {
@@ -16,12 +17,35 @@ public function testInsertAddsAudit()
 			'source_id'  => $result,
 			'event'      => 'insert',
 			'summary'    => '5 fields',
-			'user_id'    => -1,
+			'user_id'    => 0,
 		];
 
 		$queue = service('audits')->getQueue();
 
 		$this->assertCount(1, $queue);
 		$this->seeAudit($expected);
 	}
+
+	public function testUpdateAddsAudit()
+	{
+		$widget   = fake(WidgetModel::class);
+		$widgetId = $widget->id; // @phpstan-ignore-line
+
+		$this->model->update($widgetId, [
+			'name' => 'Banana Widget',
+		]);
+
+		$expected = [
+			'source'     => 'widgets',
+			'source_id'  => [$widgetId],
+			'event'      => 'update',
+			'summary'    => '2 fields',
+			'user_id'    => 0,
+		];
+
+		$queue = service('audits')->getQueue();
+
+		$this->assertCount(2, $queue);
+		$this->seeAudit($expected);
+	}
 }