Merge pull request #490 from perftools/0.21.x-merge-up-into-0.22.x_Bn…

…0UilpH
perftools · Jan 3, 2023 · c3b042b · c3b042b
2 parents b7b42de + e648dc1
commit c3b042b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 20 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,6 +18,8 @@ jobs:
           php-version: 7.2
           tools: php-cs-fixer:2.16, cs2pr
           coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies with composer
         run: composer install --no-interaction --no-progress --no-suggest

diff --git a/composer.lock b/composer.lock
diff --git a/src/Db/PdoRepository.php b/src/Db/PdoRepository.php
@@ -184,10 +184,11 @@ public function getStatistics()
 
     public function initSchema(): void
     {
+        $profileColumnType = $this->driverName === 'mysql' ? 'LONGTEXT' : 'TEXT';
         $this->pdo->exec(sprintf('
             CREATE TABLE IF NOT EXISTS %s (
               "id"               CHAR(24) PRIMARY KEY,
-              "profile"          TEXT           NOT NULL,
+              "profile"          %s             NOT NULL,
               "url"              TEXT           NULL,
               "SERVER"           TEXT           NULL,
               "GET"              TEXT           NULL,
@@ -202,7 +203,7 @@ public function initSchema(): void
               "main_mu"          INTEGER        NOT NULL,
               "main_pmu"         INTEGER        NOT NULL
             )
-        ', $this->table));
+        ', $this->table, $profileColumnType));
         $this->pdo->exec(sprintf('
             CREATE TABLE IF NOT EXISTS %s (
               "id"               CHAR(24) PRIMARY KEY,

diff --git a/src/Twig/TwigExtension.php b/src/Twig/TwigExtension.php
diff --git a/tests/Twig/ExtensionTest.php b/tests/Twig/ExtensionTest.php