Skip to content

Commit c3b042b

Browse files
authored
Merge pull request #490 from perftools/0.21.x-merge-up-into-0.22.x_Bn0UilpH
2 parents b7b42de + e648dc1 commit c3b042b

5 files changed

Lines changed: 23 additions & 20 deletions

File tree

.github/workflows/lint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
php-version: 7.2
1919
tools: php-cs-fixer:2.16, cs2pr
2020
coverage: none
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2123

2224
- name: Install dependencies with composer
2325
run: composer install --no-interaction --no-progress --no-suggest

composer.lock

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Db/PdoRepository.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,11 @@ public function getStatistics()
184184

185185
public function initSchema(): void
186186
{
187+
$profileColumnType = $this->driverName === 'mysql' ? 'LONGTEXT' : 'TEXT';
187188
$this->pdo->exec(sprintf('
188189
CREATE TABLE IF NOT EXISTS %s (
189190
"id" CHAR(24) PRIMARY KEY,
190-
"profile" TEXT NOT NULL,
191+
"profile" %s NOT NULL,
191192
"url" TEXT NULL,
192193
"SERVER" TEXT NULL,
193194
"GET" TEXT NULL,
@@ -202,7 +203,7 @@ public function initSchema(): void
202203
"main_mu" INTEGER NOT NULL,
203204
"main_pmu" INTEGER NOT NULL
204205
)
205-
', $this->table));
206+
', $this->table, $profileColumnType));
206207
$this->pdo->exec(sprintf('
207208
CREATE TABLE IF NOT EXISTS %s (
208209
"id" CHAR(24) PRIMARY KEY,

src/Twig/TwigExtension.php

100755100644
File mode changed.

tests/Twig/ExtensionTest.php

100755100644
File mode changed.

0 commit comments

Comments
 (0)