update

Author: cappuc

performance/Shopify/Database.php

@@ -48,7 +48,9 @@ function (array $product) use ($database) {
         $tables['collection'] = Arr::first($database['collections']);
         $tables['product'] = Arr::first($database['products']);
         $tables['blog'] = Arr::first($database['blogs']);
-        $tables['article'] = Arr::first($tables['blog']['articles'] ?? []);
+        $articles = $tables['blog']['articles'] ?? [];
+        assert(is_array($articles));
+        $tables['article'] = Arr::first($articles);
 
         $tables['cart'] = [
             'total_price' => array_reduce($tables['line_items'], fn (int $total, array $item) => $total + $item['line_price'] * $item['quantity'], 0),

src/Parse/Lexer.php

@@ -209,7 +209,7 @@ protected function lexBlock(): void
     protected function lexExpression(): void
     {
         if (preg_match('/\G\s+/A', $this->source, $matches, offset: $this->cursor) === 1) {
-            $this->moveCursor($matches[0] ?? '');
+            $this->moveCursor($matches[0]);
         }
 
         $this->ensureStreamNotEnded();
@@ -221,10 +221,10 @@ protected function lexExpression(): void
         }
 
         $token = match (true) {
-            preg_match(LexerOptions::comparisonOperatorRegex(), $this->source, $matches, offset: $this->cursor) === 1 => [TokenType::Comparison, $matches[0]],
-            preg_match(LexerOptions::identifierRegex(), $this->source, $matches, offset: $this->cursor) === 1 => [TokenType::Identifier, $matches[0]],
-            preg_match(LexerOptions::stringLiteralRegex(), $this->source, $matches, offset: $this->cursor) === 1 => [TokenType::String, $matches[0]],
-            preg_match(LexerOptions::numberLiteralRegex(), $this->source, $matches, offset: $this->cursor) === 1 => [TokenType::Number, $matches[0]],
+            preg_match(LexerOptions::comparisonOperatorRegex(), $this->source, $matches, offset: $this->cursor) === 1 => [TokenType::Comparison, $matches[0] ?? ''],
+            preg_match(LexerOptions::identifierRegex(), $this->source, $matches, offset: $this->cursor) === 1 => [TokenType::Identifier, $matches[0] ?? ''],
+            preg_match(LexerOptions::stringLiteralRegex(), $this->source, $matches, offset: $this->cursor) === 1 => [TokenType::String, $matches[0] ?? ''],
+            preg_match(LexerOptions::numberLiteralRegex(), $this->source, $matches, offset: $this->cursor) === 1 => [TokenType::Number, $matches[0] ?? ''],
             $this->cursor + 1 < $this->end && $this->source[$this->cursor] === '.' && $this->source[$this->cursor + 1] === '.' => [TokenType::DotDot, '..'],
             array_key_exists($this->source[$this->cursor], LexerOptions::specialCharacters()) => [LexerOptions::specialCharacters()[$this->source[$this->cursor]], $this->source[$this->cursor]],
             default => throw SyntaxException::unexpectedCharacter($this->source[$this->cursor]),

src/Tags/CycleTag.php

@@ -71,6 +71,7 @@ public function render(RenderContext $context): string
         $register = $context->getRegister('cycle') ?? [];
         assert(is_array($register));
         $key = $context->evaluate($this->name);
+        assert(is_string($key) || is_int($key));
 
         $iteration = match (true) {
             isset($register[$key]) && is_int($register[$key]) => $register[$key],