Revert "fix libheif" (#1154)

Build Unix SQLite with SQLITE_ENABLE_COLUMN_METADATA so the metadata APIs are available on macOS and Linux.

Remove the pdo_sqlite configure override that forced PHP to treat sqlite3_column_table_name() as unavailable, and add sanity checks for both SQLite compile options and PDO column metadata.

config/source.json

@@ -333,10 +333,9 @@
         }
     },
     "ext-zstd": {
-        "type": "git",
+        "type": "ghtagtar",
+        "repo": "kjdev/php-ext-zstd",
         "path": "php-src/ext/zstd",
-        "rev": "master",
-        "url": "https://github.com/kjdev/php-ext-zstd",
         "license": {
             "type": "file",
             "path": "LICENSE"

src/SPC/builder/extension/pdo_sqlite.php

@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\store\FileSystem;
-use SPC\util\CustomExt;
-
-#[CustomExt('pdo_sqlite')]
-class pdo_sqlite extends Extension
-{
-    public function patchBeforeConfigure(): bool
-    {
-        FileSystem::replaceFileRegex(
-            SOURCE_PATH . '/php-src/configure',
-            '/sqlite3_column_table_name=yes/',
-            'sqlite3_column_table_name=no'
-        );
-        return true;
-    }
-}

src/SPC/builder/unix/library/libheif.php

@@ -11,28 +11,15 @@ trait libheif
 {
     public function patchBeforeBuild(): bool
     {
-        $patched = false;
         if (!str_contains(file_get_contents($this->source_dir . '/CMakeLists.txt'), 'libbrotlienc')) {
             FileSystem::replaceFileStr(
                 $this->source_dir . '/CMakeLists.txt',
                 'list(APPEND REQUIRES_PRIVATE "libbrotlidec")',
                 'list(APPEND REQUIRES_PRIVATE "libbrotlidec")' . "\n" . '        list(APPEND REQUIRES_PRIVATE "libbrotlienc")'
             );
-            $patched = true;
+            return true;
         }
-        // libheif 1.22+ ships a C-incompatible header: `struct heif_bad_pixel`
+        return false;
-        $heif_properties = $this->source_dir . '/libheif/api/libheif/heif_properties.h';
-        if (file_exists($heif_properties)
-            && str_contains(file_get_contents($heif_properties), 'struct heif_bad_pixel { uint32_t row; uint32_t column; };')
-        ) {
-            FileSystem::replaceFileStr(
-                $heif_properties,
-                'struct heif_bad_pixel { uint32_t row; uint32_t column; };',
-                'typedef struct heif_bad_pixel { uint32_t row; uint32_t column; } heif_bad_pixel;'
-            );
-            $patched = true;
-        }
-        return $patched;
     }
 
     protected function build(): void

src/SPC/builder/unix/library/sqlite.php

@@ -10,7 +10,12 @@ trait sqlite
 {
     protected function build(): void
     {
-        UnixAutoconfExecutor::create($this)->configure()->make();
+        UnixAutoconfExecutor::create($this)
+            ->appendEnv([
+                'CFLAGS' => '-DSQLITE_ENABLE_COLUMN_METADATA=1',
+            ])
+            ->configure()
+            ->make();
         $this->patchPkgconfPrefix(['sqlite3.pc']);
     }
 }

src/globals/ext-tests/pdo_sqlite.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+$pdo = new PDO('sqlite::memory:');
+$pdo->exec('CREATE TABLE spc_column_metadata_test (id INTEGER)');
+
+$stmt = $pdo->query('SELECT id FROM spc_column_metadata_test');
+if ($stmt === false) {
+    throw new RuntimeException('Failed to query SQLite metadata test table.');
+}
+
+$metadata = $stmt->getColumnMeta(0);
+if (($metadata['table'] ?? null) !== 'spc_column_metadata_test') {
+    throw new RuntimeException('PDO SQLite column metadata does not include the origin table.');
+}

src/globals/ext-tests/sqlite3.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+$sqlite = new SQLite3(':memory:');
+$enabled = $sqlite->querySingle("SELECT sqlite_compileoption_used('ENABLE_COLUMN_METADATA')");
+
+if ((int) $enabled !== 1) {
+    throw new RuntimeException('SQLite was not built with SQLITE_ENABLE_COLUMN_METADATA.');
+}