Changeset 50251

Timestamp:

02/08/2021 08:58:53 PM (4 years ago)

Author:

desrosj

Message:

Build/Test Tools: Backport the local Docker environment to the 3.7 branch.

This commit introduces the Docker-based local WordPress development environment to the 3.7 branch.

Merges [44176,45445,45745,45762,45783-45784,45800,45819,45885,46320,46999,47225,47912,48121,49267,49335,49358,49360,49362] to the 3.7 branch.
See #47767.
Fixes #48301.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• .env (added)
• docker-compose.yml (added)
• package-lock.json (modified) (8 diffs)
• package.json (modified) (2 diffs)
• src (modified) (1 prop)
• tests/phpunit/tests/image/base.php (modified) (3 diffs)
• tests/phpunit/tests/image/editor_gd.php (modified) (6 diffs)
• tests/phpunit/tests/image/editor_imagick.php (modified) (5 diffs)
• tools/local-env (added)
• tools/local-env/default.template (added)
• tools/local-env/mysql-init.sql (added)
• tools/local-env/php-config.ini (added)
• tools/local-env/phpunit-config.ini (added)
• tools/local-env/scripts (added)
• tools/local-env/scripts/docker.js (added)
• tools/local-env/scripts/install.js (added)
• tools/local-env/scripts/start.js (added)

branches/3.7/package-lock.json

@@ -5 +5 @@
     "requires": true,
     "dependencies": {
+        "@hapi/hoek": {
+            "version": "9.1.1",
+            "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
+            "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==",
+            "dev": true
+        },
+        "@hapi/topo": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz",
+            "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==",
+            "dev": true,
+            "requires": {
+                "@hapi/hoek": "^9.0.0"
+            }
+        },
+        "@sideway/address": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.1.tgz",
+            "integrity": "sha512-+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ==",
+            "dev": true,
+            "requires": {
+                "@hapi/hoek": "^9.0.0"
+            }
+        },
+        "@sideway/formula": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
+            "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==",
+            "dev": true
+        },
+        "@sideway/pinpoint": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+            "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
+            "dev": true
+        },
         "@types/node": {
             "version": "14.14.22",
@@ -235 +271 @@
             "dev": true
         },
+        "axios": {
+            "version": "0.21.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+            "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+            "dev": true,
+            "requires": {
+                "follow-redirects": "^1.10.0"
+            }
+        },
         "balanced-match": {
             "version": "1.0.0",
@@ -680 +725 @@
             "dev": true
         },
+        "dotenv": {
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+            "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+            "dev": true
+        },
+        "dotenv-expand": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+            "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+            "dev": true
+        },
         "duplexer": {
             "version": "0.1.2",
@@ -1036 +1093 @@
             "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
             "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+            "dev": true
+        },
+        "follow-redirects": {
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
+            "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
             "dev": true
         },
@@ -2057 +2120 @@
             "dev": true
         },
+        "joi": {
+            "version": "17.4.0",
+            "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz",
+            "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==",
+            "dev": true,
+            "requires": {
+                "@hapi/hoek": "^9.0.0",
+                "@hapi/topo": "^5.0.0",
+                "@sideway/address": "^4.1.0",
+                "@sideway/formula": "^3.0.0",
+                "@sideway/pinpoint": "^2.0.0"
+            }
+        },
         "js-yaml": {
             "version": "3.14.1",
@@ -2361 +2437 @@
                 "brace-expansion": "^1.1.7"
             }
+        },
+        "minimist": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+            "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+            "dev": true
         },
         "mitt": {
@@ -3363 +3445 @@
             }
         },
+        "tslib": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+            "dev": true
+        },
         "tunnel-agent": {
             "version": "0.6.0",
@@ -3521 +3609 @@
             }
         },
+        "wait-on": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.2.1.tgz",
+            "integrity": "sha512-H2F986kNWMU9hKlI9l/ppO6tN8ZSJd35yBljMLa1/vjzWP++Qh6aXyt77/u7ySJFZQqBtQxnvm/xgG48AObXcw==",
+            "dev": true,
+            "requires": {
+                "axios": "^0.21.1",
+                "joi": "^17.3.0",
+                "lodash": "^4.17.20",
+                "minimist": "^1.2.5",
+                "rxjs": "^6.6.3"
+            },
+            "dependencies": {
+                "rxjs": {
+                    "version": "6.6.3",
+                    "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+                    "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+                    "dev": true,
+                    "requires": {
+                        "tslib": "^1.9.0"
+                    }
+                }
+            }
+        },
         "websocket-driver": {
             "version": "0.7.4",

branches/3.7/package.json

@@ -14 +14 @@
     "license": "GPLv2 or later",
     "devDependencies": {
+        "dotenv": "^8.2.0",
+        "dotenv-expand": "^5.1.0",
         "grunt": "~1.3.0",
         "grunt-contrib-clean": "~2.0.0",
@@ -25 +27 @@
         "grunt-legacy-util": "^2.0.0",
         "grunt-patch-wordpress": "~3.0.0",
-        "matchdep": "~2.0.0"
+        "matchdep": "~2.0.0",
+        "wait-on": "5.2.1"
+    },
+    "scripts": {
+        "build": "grunt build",
+        "test": "grunt test",
+        "watch": "grunt watch",
+        "grunt": "grunt",
+        "env:start": "node ./tools/local-env/scripts/start.js",
+        "env:stop": "node ./tools/local-env/scripts/docker.js down",
+        "env:restart": "npm run env:stop && npm run env:start",
+        "env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans",
+        "env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans",
+        "env:install": "node ./tools/local-env/scripts/install.js",
+        "env:cli": "node ./tools/local-env/scripts/docker.js run cli",
+        "env:logs": "node ./tools/local-env/scripts/docker.js logs",
+        "env:pull": "node ./tools/local-env/scripts/docker.js pull",
+        "test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit"
     }
 }

branches/3.7/tests/phpunit/tests/image/base.php

@@ -38 +38 @@
 
     /**
-     * Helper assertion for testing alpha on images
+     * Helper assertion for testing alpha on images using GD library
      *
      * @param  string $image_path
@@ -44 +44 @@
      * @param  int $alpha
      */
-    protected function assertImageAlphaAtPoint( $image_path, $point, $alpha ) {
+    protected function assertImageAlphaAtPointGD( $image_path, $point, $alpha ) {
 
         $im = imagecreatefrompng( $image_path );
@@ -53 +53 @@
         $this->assertEquals( $alpha, $colors['alpha'] );
     }
+
+    /**
+     * Helper assertion for testing alpha on images using Imagick
+     *
+     * @param string $image_path
+     * @param array $point      array(x,y)
+     * @param int $expected
+     */
+    protected function assertImageAlphaAtPointImagick( $image_path, $point, $expected ) {
+        $im = new Imagick( $image_path );
+        $pixel = $im->getImagePixelColor( $point[0], $point[1] );
+        $color = $pixel->getColorValue( imagick::COLOR_ALPHA );
+        $this->assertEquals( $expected, $color );
+    }
 }

branches/3.7/tests/phpunit/tests/image/editor_gd.php

@@ -33 +33 @@
     /**
      * Check support for GD compatible mime types.
-     * 
+     *
      */
     public function test_supports_mime_type() {
@@ -45 +45 @@
     /**
      * Test resizing an image, not using crop
-     * 
+     *
      */
     public function test_resize() {
@@ -61 +61 @@
     /**
      * Test resizing an image including cropping
-     * 
+     *
      */
     public function test_resize_and_crop() {
@@ -133 +133 @@
     /**
      * Test the image created with WP_Image_Edior_GD preserves alpha when resizing
-     * 
+     *
      * @ticket 23039
      */
@@ -144 +144 @@
         $editor->resize(5,5);
         $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
-        
+
         $editor->save( $save_to_file );
 
-        $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+        $this->assertImageAlphaAtPointGD( $save_to_file, array( 0,0 ), 127 );
 
         unlink( $save_to_file );
     }
-    
+
     /**
      * Test the image created with WP_Image_Edior_GD preserves alpha with no resizing etc
-     * 
+     *
      * @ticket 23039
      */
@@ -165 +165 @@
 
         $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
-        
+
         $editor->save( $save_to_file );
 
-        $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+        $this->assertImageAlphaAtPointGD( $save_to_file, array( 0,0 ), 127 );
 
         unlink( $save_to_file );

branches/3.7/tests/phpunit/tests/image/editor_imagick.php

@@ -39 +39 @@
     /**
      * Check support for Image Magick compatible mime types.
-     * 
+     *
      */
     public function test_supports_mime_type() {
@@ -52 +52 @@
     /**
      * Test resizing an image, not using crop
-     * 
+     *
      */
     public function test_resize() {
@@ -68 +68 @@
     /**
      * Test resizing an image including cropping
-     * 
+     *
      */
     public function test_resize_and_crop() {
@@ -151 +151 @@
         $editor->resize(5,5);
         $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
-        
+
         $editor->save( $save_to_file );
 
-        $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+        $im = new Imagick( $save_to_file );
+        $pixel = $im->getImagePixelColor( 0, 0 );
+        $expected = $pixel->getColorValue( imagick::COLOR_ALPHA );
+
+        $this->assertImageAlphaAtPointImagick( $save_to_file, array( 0,0 ), $expected );
 
         unlink( $save_to_file );
     }
-    
+
     /**
      * Test the image created with WP_Image_Edior_Imagick preserves alpha with no resizing etc
@@ -175 +179 @@
         $editor->save( $save_to_file );
 
-        $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+        $im = new Imagick( $save_to_file );
+        $pixel = $im->getImagePixelColor( 0, 0 );
+        $expected = $pixel->getColorValue( imagick::COLOR_ALPHA );
+
+        $this->assertImageAlphaAtPointImagick( $save_to_file, array( 0,0 ), $expected );
 
         unlink( $save_to_file );