Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 0 additions & 114 deletions .github/workflows/integration-tests-windows.yml

This file was deleted.

11 changes: 6 additions & 5 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ jobs:
- 8.5
os:
- ubuntu-latest
# - windows-latest
- windows-latest
env:
POSTGRES_USER: ${{ matrix.os == 'windows-latest' && 'postgres' || 'runner' }}

name: "Run tests: ${{ matrix.os }}"

Expand Down Expand Up @@ -57,7 +59,7 @@ jobs:
matrix:
os:
- ubuntu-latest
# - windows-latest
- windows-latest
php:
- 8.5
database:
Expand All @@ -67,9 +69,8 @@ jobs:
stability:
- prefer-stable
- prefer-lowest
# exclude:
# - os: windows-latest
# database: postgres
env:
POSTGRES_USER: ${{ matrix.os == 'windows-latest' && 'postgres' || 'runner' }}

name: "Run tests: PHP ${{ matrix.php }} - ${{ matrix.database }} - ${{ matrix.stability }} - ${{ matrix.os }}"

Expand Down
2 changes: 1 addition & 1 deletion packages/console/src/Highlight/DynamicTokenType.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function getAfterStyle(): TerminalStyle

public function getValue(): string
{
return '';
return $this->style;
}

public function canContain(TokenType $other): bool
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/Kernel/LoadConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Tempest\Core\Kernel;
use Tempest\Support\Arr\MutableArray;
use Tempest\Support\Filesystem;
use Tempest\Support\Path;
use Tempest\Support\Str;

use function Tempest\root_path;
Expand Down Expand Up @@ -96,6 +97,8 @@ private function scan(string $path, MutableArray $configPaths): void
return;
}

$input = Path\normalize($input);

// Directories are scanned recursively
if (is_dir($input)) {
// Make sure the current directory is not marked for skipping
Expand Down
16 changes: 3 additions & 13 deletions packages/view/src/Parser/TempestViewLexer.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

final class TempestViewLexer
{
private const string WHITESPACE = PHP_EOL . "\n\t\f ";
private const string WHITESPACE = "\r\n\t\f ";

private int $position = 0;

Expand Down Expand Up @@ -35,7 +35,7 @@ public function lex(): TokenCollection
$tokens = [...$tokens, ...$this->lexCharacterData()];
} elseif ($this->comesNext('<')) {
$tokens = [...$tokens, ...$this->lexTag()];
} elseif ($this->comesNext(' ') || $this->comesNext(PHP_EOL)) {
} elseif (str_contains(self::WHITESPACE, $this->current)) {
$tokens[] = $this->lexWhitespace();
} else {
$tokens[] = $this->lexContent();
Expand Down Expand Up @@ -218,17 +218,7 @@ private function lexDoctype(): Token

private function lexWhitespace(): Token
{
$buffer = '';

while ($this->current !== null) {
$seek = $this->seek();

if ($seek !== ' ' && $seek !== PHP_EOL) {
break;
}

$buffer .= $this->consume();
}
$buffer = $this->consumeWhile(self::WHITESPACE);

return new Token($buffer, TokenType::WHITESPACE);
}
Expand Down