From 4f401bf2a8f8ce5c3a55101fd790235c68d2be2c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 4 Nov 2022 20:05:49 +0100 Subject: [PATCH 1/6] fix function naming --- Ai/Ocr/BasicOcr.php | 2 +- Math/Stochastic/NaiveBayesClassifier.php | 2 +- tests/Ai/Ocr/BasicOcrTest.php | 2 +- tests/Math/Stochastic/NaiveBayesClassifierTest.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Ai/Ocr/BasicOcr.php b/Ai/Ocr/BasicOcr.php index 934104e48..68baaa8b2 100644 --- a/Ai/Ocr/BasicOcr.php +++ b/Ai/Ocr/BasicOcr.php @@ -248,7 +248,7 @@ final class BasicOcr * * @since 1.0.0 */ - public function match(string $path, int $comparison = 3, int $limit = 0) : array + public function matchImage(string $path, int $comparison = 3, int $limit = 0) : array { // @todo: implement image reading if it isn't an mnist file $Xtest = $this->readImages($path, $limit); diff --git a/Math/Stochastic/NaiveBayesClassifier.php b/Math/Stochastic/NaiveBayesClassifier.php index de456e290..3098b6206 100644 --- a/Math/Stochastic/NaiveBayesClassifier.php +++ b/Math/Stochastic/NaiveBayesClassifier.php @@ -123,7 +123,7 @@ final class NaiveBayesClassifier * * @since 1.0.0 */ - public function match(string $criteria, array $toMatch, int $minimum = 3) : float + public function matchCriteria(string $criteria, array $toMatch, int $minimum = 3) : float { $this->preCalculateProbabilities($toMatch); diff --git a/tests/Ai/Ocr/BasicOcrTest.php b/tests/Ai/Ocr/BasicOcrTest.php index fdb4717dc..653423cf0 100644 --- a/tests/Ai/Ocr/BasicOcrTest.php +++ b/tests/Ai/Ocr/BasicOcrTest.php @@ -38,7 +38,7 @@ final class BasicOcrTest extends \PHPUnit\Framework\TestCase ['label' => 0, 'prob' => 1], ['label' => 0, 'prob' => 1], ['label' => 0, 'prob' => 1], ['label' => 4, 'prob' => 2 / 3], ['label' => 9, 'prob' => 1 / 3], ['label' => 4, 'prob' => 2 / 3], ], - $ocr->match(__DIR__ . '/t10k-images-idx3-ubyte', 3, 5) + $ocr->matchImage(__DIR__ . '/t10k-images-idx3-ubyte', 3, 5) ); } diff --git a/tests/Math/Stochastic/NaiveBayesClassifierTest.php b/tests/Math/Stochastic/NaiveBayesClassifierTest.php index ad07b719c..2ecf5440e 100644 --- a/tests/Math/Stochastic/NaiveBayesClassifierTest.php +++ b/tests/Math/Stochastic/NaiveBayesClassifierTest.php @@ -69,7 +69,7 @@ final class NaiveBayesClassifierTest extends \PHPUnit\Framework\TestCase self::assertEqualsWithDelta( 0.6, - $filter->match('play', ['weather' => ['Sunny']], 1), + $filter->matchCriteria('play', ['weather' => ['Sunny']], 1), 0.01 ); } @@ -86,7 +86,7 @@ final class NaiveBayesClassifierTest extends \PHPUnit\Framework\TestCase self::assertEqualsWithDelta( 0.999988, - $filter->match('female', ['height' => 6, 'weight' => 130, 'foot' => 8]), + $filter->matchCriteria('female', ['height' => 6, 'weight' => 130, 'foot' => 8]), 0.01 ); } From 11f34bcccc467b3b022e994dd0ee832433dd864d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 5 Nov 2022 01:38:55 +0100 Subject: [PATCH 2/6] inspection fixes --- .github/workflows/main.yml | 6 ++++++ Dispatcher/Dispatcher.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 00b4bd9c8..1c615c4de 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -93,6 +93,12 @@ jobs: ref: develop repository: Karaka-Management/Resources path: Resources + - name: Run the action + uses: potatoqualitee/mssqlsuite@v1.5.1 + with: + install: sqlengine, sqlclient, sqlpackage, localdb + version: 2017 + sa-password: R00troot - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@master with: diff --git a/Dispatcher/Dispatcher.php b/Dispatcher/Dispatcher.php index 92dc52a88..72d66fa5d 100644 --- a/Dispatcher/Dispatcher.php +++ b/Dispatcher/Dispatcher.php @@ -129,7 +129,7 @@ final class Dispatcher implements DispatcherInterface $views[$controller] = $data === null ? $function() : $function(...$data); } elseif ($c === 2) { - $obj = $this->getController($dispatch[0]); + $obj = $this->getController($dispatch[0]); $views[$controller] = $data === null ? $obj->{$dispatch[1]}() : $obj->{$dispatch[1]}(...$data); From eb85b49c40efe7005e14b1698683ff6cf571f0b6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 5 Nov 2022 02:01:09 +0100 Subject: [PATCH 3/6] fix CI --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c615c4de..b4ca1aa0d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -93,12 +93,12 @@ jobs: ref: develop repository: Karaka-Management/Resources path: Resources - - name: Run the action - uses: potatoqualitee/mssqlsuite@v1.5.1 - with: - install: sqlengine, sqlclient, sqlpackage, localdb - version: 2017 - sa-password: R00troot + - name: Create mssql/sqlsrv + uses: potatoqualitee/mssqlsuite@v1.5.1 + with: + install: sqlengine, sqlclient, sqlpackage, localdb + version: 2017 + sa-password: R00troot - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@master with: From 34543e5d34433444c98549a8fbf0cc5d0f0eb3fc Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 5 Nov 2022 09:54:12 +0100 Subject: [PATCH 4/6] update mssql ip --- tests/Bootstrap.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 5478fee87..55dc399de 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -236,7 +236,7 @@ $CONFIG = [ 'mssql' => [ 'admin' => [ 'db' => 'mssql', /* db type */ - 'host' => '127.0.0.1', /* db host address */ + 'host' => 'localhost', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'R00troot', /* db login password */ @@ -246,7 +246,7 @@ $CONFIG = [ ], 'insert' => [ 'db' => 'mssql', /* db type */ - 'host' => '127.0.0.1', /* db host address */ + 'host' => 'localhost', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'R00troot', /* db login password */ @@ -256,7 +256,7 @@ $CONFIG = [ ], 'select' => [ 'db' => 'mssql', /* db type */ - 'host' => '127.0.0.1', /* db host address */ + 'host' => 'localhost', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'R00troot', /* db login password */ @@ -266,7 +266,7 @@ $CONFIG = [ ], 'update' => [ 'db' => 'mssql', /* db type */ - 'host' => '127.0.0.1', /* db host address */ + 'host' => 'localhost', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'R00troot', /* db login password */ @@ -276,7 +276,7 @@ $CONFIG = [ ], 'delete' => [ 'db' => 'mssql', /* db type */ - 'host' => '127.0.0.1', /* db host address */ + 'host' => 'localhost', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'R00troot', /* db login password */ @@ -286,7 +286,7 @@ $CONFIG = [ ], 'schema' => [ 'db' => 'mssql', /* db type */ - 'host' => '127.0.0.1', /* db host address */ + 'host' => 'localhost', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ 'password' => 'R00troot', /* db login password */ From 2c892ade6385c9d25ae9adc7b78751575b7b8141 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 5 Nov 2022 10:24:14 +0100 Subject: [PATCH 5/6] mssql fixes --- .github/workflows/main.yml | 3 +-- tests/Bootstrap.php | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b4ca1aa0d..cdf4d9f1e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,8 +97,7 @@ jobs: uses: potatoqualitee/mssqlsuite@v1.5.1 with: install: sqlengine, sqlclient, sqlpackage, localdb - version: 2017 - sa-password: R00troot + sa-password: c0MplicatedP@ssword - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@master with: diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 55dc399de..39e6270f5 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -236,60 +236,60 @@ $CONFIG = [ 'mssql' => [ 'admin' => [ 'db' => 'mssql', /* db type */ - 'host' => 'localhost', /* db host address */ + 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ - 'password' => 'R00troot', /* db login password */ + 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'oms', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], 'insert' => [ 'db' => 'mssql', /* db type */ - 'host' => 'localhost', /* db host address */ + 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ - 'password' => 'R00troot', /* db login password */ + 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'oms', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], 'select' => [ 'db' => 'mssql', /* db type */ - 'host' => 'localhost', /* db host address */ + 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ - 'password' => 'R00troot', /* db login password */ + 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'oms', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], 'update' => [ 'db' => 'mssql', /* db type */ - 'host' => 'localhost', /* db host address */ + 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ - 'password' => 'R00troot', /* db login password */ + 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'oms', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], 'delete' => [ 'db' => 'mssql', /* db type */ - 'host' => 'localhost', /* db host address */ + 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ - 'password' => 'R00troot', /* db login password */ + 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'oms', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], 'schema' => [ 'db' => 'mssql', /* db type */ - 'host' => 'localhost', /* db host address */ + 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ 'login' => 'sa', /* db login name */ - 'password' => 'R00troot', /* db login password */ + 'password' => 'c0MplicatedP@ssword', /* db login password */ 'database' => 'oms', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', From 34f53c50e320048de2aadabcd65439826dd2e952 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 5 Nov 2022 12:22:31 +0100 Subject: [PATCH 6/6] test mssql service --- .github/workflows/main.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cdf4d9f1e..57d9b0623 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,6 +60,13 @@ jobs: ports: - 5432:5432 options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3 + mssql: + image: mcr.microsoft.com/mssql/server:2019-latest + env: + SA_PASSWORD: c0MplicatedP@ssword + ACCEPT_EULA: 'Y' + ports: + - 1433:1433 redis: image: redis ports: @@ -93,11 +100,6 @@ jobs: ref: develop repository: Karaka-Management/Resources path: Resources - - name: Create mssql/sqlsrv - uses: potatoqualitee/mssqlsuite@v1.5.1 - with: - install: sqlengine, sqlclient, sqlpackage, localdb - sa-password: c0MplicatedP@ssword - name: Setup PHP, with composer and extensions uses: shivammathur/setup-php@master with: