WordPress.org
Get WordPress

Make WordPress Core

Changeset 49532


Ignore:
Timestamp:
11/06/2020 05:37:22 PM (4 years ago)
Author:
desrosj
Message:

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

This commit introduces the Docker-based local WordPress development environment to the 4.7 branch and converts the Travis test jobs to utilize this environment for easier and more consistent testing.

Until existing blockers with the PHP 5.2 Docker container can be solved, the PHP 5.2 test job will remain using the Travis precise image.

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

Location:
branches/4.7
Files:
12 added
5 edited

Legend:

Unmodified
Added
Removed

  • branches/4.7/.travis.yml

    r45008 r49532  
    1 sudo: false
    2 dist: trusty
    31language: php
     2
     3services:
     4  - docker
     5
    46cache:
    57  apt: true
    … …  
    79    - $HOME/.npm
    810    - vendor
    9     - $HOME/.composer/cache
     11
    1012env:
    1113  global:
    12     - WP_TRAVISCI=travis:phpunit
     14    - LOCAL_DIR: build
     15    - NPM_INSTALL: true
     16    - WP_INSTALL: true
     17    - PHP_FPM_UID: "`id -u`"
     18    - PHP_FPM_GID: "`id -g`"
     19
    1320matrix:
    1421  include:
    15   - php: 7.1
    16     env: WP_TRAVISCI=travis:js
    17   - php: 7.1
    18   - php: 5.6
    19     env: WP_TRAVIS_OBJECT_CACHE=true
    20     services: memcached
    21   - php: 5.2
    22     dist: precise
     22    - env: WP_TRAVISCI=travis:js LOCAL_PHP=7.1-fpm WP_INSTALL=false
     23      name: "JS Tests"
     24    - env: LOCAL_PHPUNIT=6-php-7.1-fpm WP_TRAVISCI=test:php
     25      name: "PHPUnit Tests: PHP 7.1"
     26    - env: LOCAL_PHP_MEMCACHED=true LOCAL_PHP=5.6-fpm LOCAL_PHPUNIT=4-php-5.6-fpm WP_TRAVISCI=test:php
     27      name: "PHPUnit Tests: PHP 5.6 with Memcached"
     28    - env: WP_TRAVISCI=travis:phpunit WP_INSTALL=false
     29      php: 5.2
     30      dist: precise
     31      name: "PHPUnit Tests: PHP 5.2"
     32  fast_finish: true
     33
    2334before_install:
    24 - |
    25   if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
     35  - |
     36    if [[ "$WP_TRAVISCI" == "test:php" ]]; then
     37      travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
     38    fi
     39  - |
     40    if [[ "$WP_TRAVISCI" != "travis:phpunit" ]]; then
     41      curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
     42      sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
     43      sudo apt-get update
     44      sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
     45    fi
     46  - |
     47    sudo rm /usr/local/bin/docker-compose
     48    curl -L https://github.com/docker/compose/releases/download/1.24.0/docker-compose-`uname -s`-`uname -m` > docker-compose
     49    chmod +x docker-compose
     50    sudo mv docker-compose /usr/local/bin
     51  - |
     52    if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
    2653      mysql -u root -e "CREATE DATABASE wordpress_tests;"
    2754      cp wp-tests-config-sample.php wp-tests-config.php
    … …  
    2956      sed -i "s/yourusernamehere/root/" wp-tests-config.php
    3057      sed -i "s/yourpasswordhere//" wp-tests-config.php
    31       svn checkout https://plugins.svn.wordpress.org/wordpress-importer/trunk tests/phpunit/data/plugins/wordpress-importer
    32   fi
    33 - |
    34   if [[ "$WP_TRAVIS_OBJECT_CACHE" == "true" ]]; then
    35     curl https://raw.githubusercontent.com/tollmanz/wordpress-pecl-memcached-object-cache/584392b56dc4adbe52bd2c7b86f875e23a3e5f75/object-cache.php > src/wp-content/object-cache.php
    36     echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
    37   fi
     58      travis_retry svn checkout https://plugins.svn.wordpress.org/wordpress-importer/tags/0.6.3/ tests/phpunit/data/plugins/wordpress-importer
     59    fi
     60
    3861before_script:
    39 - |
    40   # Remove Xdebug for a huge performance increase, but not from nightly:
    41   stable='^[0-9\.]+$'
    42   if [[ "$TRAVIS_PHP_VERSION" =~ $stable ]]; then
    43     phpenv config-rm xdebug.ini
    44   fi
    45 - |
    46   # Export Composer's global bin dir to PATH, but not on PHP 5.2:
    47   if [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]]; then
    48     composer config --list --global
    49     export PATH=`composer config --list --global | grep '\[home\]' | { read a; echo "${a#* }/vendor/bin:$PATH"; }`
    50   fi
    51 - |
    52   # Install the specified version of PHPUnit depending on the PHP version:
    53   if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
    54     case "$TRAVIS_PHP_VERSION" in
    55       7.1|7.0|nightly)
    56         echo "Using PHPUnit 6.x"
    57         composer global require "phpunit/phpunit:^6"
    58         ;;
    59       5.6|5.5|5.4|5.3)
    60         echo "Using PHPUnit 4.x"
    61         composer global require "phpunit/phpunit:^4"
    62         ;;
    63       5.2)
    64         # Do nothing, use default PHPUnit 3.6.x
    65         echo "Using default PHPUnit, hopefully 3.6"
    66         ;;
    67       *)
    68         echo "No PHPUnit version handling for PHP version $TRAVIS_PHP_VERSION"
    69         exit 1
    70         ;;
    71     esac
    72   fi
    73 - npm --version
    74 - node --version
    75 - nvm install 6.9.1
    76 - npm install -g grunt-cli
    77 - npm install
    78 - npm prune
    79 - mysql --version
    80 - phpenv versions
    81 - php --version
    82 - php -m
    83 - npm --version
    84 - node --version
    85 - which phpunit
    86 - phpunit --version
    87 - curl --version
    88 - grunt --version
    89 - git --version
    90 - svn --version
    91 script: grunt $WP_TRAVISCI
     62  - npm --version
     63  - node --version
     64  - nvm install
     65  - |
     66    if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
     67      phpenv config-rm xdebug.ini
     68      mysql --version
     69      phpenv versions
     70      php --version
     71      php -m
     72    fi
     73  - |
     74    if [[ "$NPM_INSTALL" == "true" ]]; then
     75      npm install
     76    fi
     77  - |
     78    if [[ "$WP_TRAVISCI" == "test:php" ]]; then
     79      npm run env:start
     80      npm run build
     81      docker-compose run --rm mysql mysql --version
     82      docker-compose run --rm php php --version
     83      docker-compose run --rm php php -m
     84      docker-compose run --rm phpunit phpunit --version
     85    fi
     86  - |
     87    if [[ "$LOCAL_PHP_MEMCACHED" == "true" ]]; then
     88      cp tests/phpunit/includes/object-cache.php build/wp-content/object-cache.php
     89      docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
     90    fi
     91  - |
     92    if [[ "$WP_INSTALL" == "true" ]]; then
     93      # Run the install process after memcached has started.
     94      npm run env:install
     95    fi
     96  - npm --version
     97  - node --version
     98  - curl --version
     99  - git --version
     100  - svn --version
     101  - php --version
     102  - php -i
     103  - locale -a
     104
     105script:
     106  - |
     107    if [[ "$WP_TRAVISCI" == "test:php" ]]; then
     108      npm run test:php -- --verbose -c phpunit.xml.dist &&
     109      npm run test:php -- --verbose -c phpunit.xml.dist --group ajax &&
     110      npm run test:php -- --verbose -c tests/phpunit/multisite.xml &&
     111      npm run test:php -- --verbose -c tests/phpunit/multisite.xml --group ms-files &&
     112      npm run test:php -- --verbose -c phpunit.xml.dist --group external-http &&
     113      npm run test:php -- --verbose -c phpunit.xml.dist --group restapi-jsclient &&
     114      # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
     115      LOCAL_PHP_XDEBUG=true npm run test:php -- -v --group xdebug --exclude-group __fakegroup__
     116    else
     117      npm run grunt $WP_TRAVISCI
     118    fi
     119
     120after_script:
     121  - |
     122    if [[ "$WP_TEST_REPORTER" == "true" ]]; then
     123      git clone https://github.com/WordPress/phpunit-test-runner.git test-runner
     124      docker-compose run --rm -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
     125    fi
     126
    92127notifications:
    93128  slack:

  • branches/4.7/npm-shrinkwrap.json

    r39368 r49532  
    11{
    22  "name": "WordPress",
    3   "version": "4.7.0",
     3  "version": "4.7.19",
    44  "dependencies": {
    55    "abbrev": {
    … …  
    1515      "dev": true
    1616    },
     17    "ajv": {
     18      "version": "6.12.6",
     19      "from": "ajv@>=6.12.3 <7.0.0",
     20      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
     21      "dev": true
     22    },
    1723    "align-text": {
    1824      "version": "0.1.4",
    … …  
    280286      "from": "async-foreach@>=0.1.3 <0.2.0",
    281287      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
     288      "dev": true
     289    },
     290    "asynckit": {
     291      "version": "0.4.0",
     292      "from": "asynckit@>=0.4.0 <0.5.0",
     293      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
    282294      "dev": true
    283295    },
    … …  
    838850      "dev": true
    839851    },
     852    "core-js": {
     853      "version": "2.6.11",
     854      "from": "core-js@>=2.5.7 <3.0.0",
     855      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
     856      "dev": true
     857    },
    840858    "core-util-is": {
    841859      "version": "1.0.2",
    … …  
    12191237      "dev": true
    12201238    },
     1239    "dotenv": {
     1240      "version": "8.2.0",
     1241      "from": "dotenv@>=8.2.0 <9.0.0",
     1242      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
     1243      "dev": true
     1244    },
     1245    "dotenv-expand": {
     1246      "version": "5.1.0",
     1247      "from": "dotenv-expand@>=5.1.0 <6.0.0",
     1248      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
     1249      "dev": true
     1250    },
    12211251    "download": {
    12221252      "version": "4.4.3",
    … …  
    14691499      "dev": true
    14701500    },
     1501    "fast-deep-equal": {
     1502      "version": "3.1.3",
     1503      "from": "fast-deep-equal@>=3.1.1 <4.0.0",
     1504      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
     1505      "dev": true
     1506    },
     1507    "fast-json-stable-stringify": {
     1508      "version": "2.1.0",
     1509      "from": "fast-json-stable-stringify@>=2.0.0 <3.0.0",
     1510      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
     1511      "dev": true
     1512    },
    14711513    "faye-websocket": {
    14721514      "version": "0.10.0",
    … …  
    18991941      }
    19001942    },
     1943    "grunt-cli": {
     1944      "version": "0.1.13",
     1945      "from": "grunt-cli@0.1.13",
     1946      "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz",
     1947      "dev": true,
     1948      "dependencies": {
     1949        "resolve": {
     1950          "version": "0.3.1",
     1951          "from": "resolve@>=0.3.1 <0.4.0",
     1952          "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz",
     1953          "dev": true
     1954        }
     1955      }
     1956    },
    19011957    "grunt-contrib-clean": {
    19021958      "version": "1.0.0",
    … …  
    22372293      "from": "gzip-size@>=1.0.0 <2.0.0",
    22382294      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz",
     2295      "dev": true
     2296    },
     2297    "har-schema": {
     2298      "version": "2.0.0",
     2299      "from": "har-schema@>=2.0.0 <3.0.0",
     2300      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
    22392301      "dev": true
    22402302    },
    … …  
    27562818      "dev": true
    27572819    },
     2820    "isemail": {
     2821      "version": "3.2.0",
     2822      "from": "isemail@>=3.0.0 <4.0.0",
     2823      "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz",
     2824      "dev": true,
     2825      "dependencies": {
     2826        "punycode": {
     2827          "version": "2.1.1",
     2828          "from": "punycode@>=2.0.0 <3.0.0",
     2829          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
     2830          "dev": true
     2831        }
     2832      }
     2833    },
    27582834    "isexe": {
    27592835      "version": "1.1.2",
    … …  
    27812857      "optional": true
    27822858    },
     2859    "joi": {
     2860      "version": "13.7.0",
     2861      "from": "joi@>=13.0.0 <14.0.0",
     2862      "resolved": "https://registry.npmjs.org/joi/-/joi-13.7.0.tgz",
     2863      "dev": true,
     2864      "dependencies": {
     2865        "hoek": {
     2866          "version": "5.0.4",
     2867          "from": "hoek@>=5.0.0 <6.0.0",
     2868          "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz",
     2869          "dev": true
     2870        }
     2871      }
     2872    },
    27832873    "jpegtran-bin": {
    27842874      "version": "3.1.0",
    … …  
    28312921      "from": "json-schema@0.2.3",
    28322922      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
     2923      "dev": true
     2924    },
     2925    "json-schema-traverse": {
     2926      "version": "0.4.1",
     2927      "from": "json-schema-traverse@>=0.4.1 <0.5.0",
     2928      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
    28332929      "dev": true
    28342930    },
    … …  
    36453741      "dev": true
    36463742    },
     3743    "performance-now": {
     3744      "version": "2.1.0",
     3745      "from": "performance-now@>=2.1.0 <3.0.0",
     3746      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
     3747      "dev": true
     3748    },
    36473749    "phantomjs-prebuilt": {
    36483750      "version": "2.1.13",
    … …  
    37313833      "dev": true
    37323834    },
     3835    "psl": {
     3836      "version": "1.8.0",
     3837      "from": "psl@>=1.1.28 <2.0.0",
     3838      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
     3839      "dev": true
     3840    },
    37333841    "public-encrypt": {
    37343842      "version": "4.0.0",
    … …  
    39724080      "dev": true
    39734081    },
     4082    "rx": {
     4083      "version": "4.1.0",
     4084      "from": "rx@>=4.1.0 <5.0.0",
     4085      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
     4086      "dev": true
     4087    },
    39744088    "rx-lite": {
    39754089      "version": "3.1.2",
    39764090      "from": "rx-lite@>=3.1.2 <4.0.0",
    39774091      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
     4092      "dev": true
     4093    },
     4094    "safe-buffer": {
     4095      "version": "5.2.1",
     4096      "from": "safe-buffer@>=5.1.2 <6.0.0",
     4097      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
    39784098      "dev": true
    39794099    },
    … …  
    44544574      "dev": true
    44554575    },
     4576    "topo": {
     4577      "version": "3.0.3",
     4578      "from": "topo@>=3.0.0 <4.0.0",
     4579      "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.3.tgz",
     4580      "dev": true,
     4581      "dependencies": {
     4582        "hoek": {
     4583          "version": "6.1.3",
     4584          "from": "hoek@>=6.0.0 <7.0.0",
     4585          "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz",
     4586          "dev": true
     4587        }
     4588      }
     4589    },
    44564590    "tough-cookie": {
    44574591      "version": "2.3.2",
    … …  
    45674701      "dev": true
    45684702    },
     4703    "uri-js": {
     4704      "version": "4.4.0",
     4705      "from": "uri-js@>=4.2.2 <5.0.0",
     4706      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
     4707      "dev": true,
     4708      "dependencies": {
     4709        "punycode": {
     4710          "version": "2.1.1",
     4711          "from": "punycode@^2.1.0",
     4712          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
     4713          "dev": true
     4714        }
     4715      }
     4716    },
    45694717    "uri-path": {
    45704718      "version": "1.0.0",
    … …  
    46764824      "dev": true
    46774825    },
     4826    "wait-on": {
     4827      "version": "3.2.0",
     4828      "from": "wait-on@>=3.2.0 <3.3.0",
     4829      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.2.0.tgz",
     4830      "dev": true,
     4831      "dependencies": {
     4832        "assert-plus": {
     4833          "version": "1.0.0",
     4834          "from": "assert-plus@>=1.0.0 <2.0.0",
     4835          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
     4836          "dev": true
     4837        },
     4838        "aws-sign2": {
     4839          "version": "0.7.0",
     4840          "from": "aws-sign2@>=0.7.0 <0.8.0",
     4841          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
     4842          "dev": true
     4843        },
     4844        "aws4": {
     4845          "version": "1.11.0",
     4846          "from": "aws4@>=1.8.0 <2.0.0",
     4847          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
     4848          "dev": true
     4849        },
     4850        "caseless": {
     4851          "version": "0.12.0",
     4852          "from": "caseless@>=0.12.0 <0.13.0",
     4853          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
     4854          "dev": true
     4855        },
     4856        "combined-stream": {
     4857          "version": "1.0.8",
     4858          "from": "combined-stream@>=1.0.6 <1.1.0",
     4859          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
     4860          "dev": true
     4861        },
     4862        "extend": {
     4863          "version": "3.0.2",
     4864          "from": "extend@>=3.0.2 <3.1.0",
     4865          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
     4866          "dev": true
     4867        },
     4868        "form-data": {
     4869          "version": "2.3.3",
     4870          "from": "form-data@>=2.3.2 <2.4.0",
     4871          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
     4872          "dev": true
     4873        },
     4874        "har-validator": {
     4875          "version": "5.1.5",
     4876          "from": "har-validator@>=5.1.3 <5.2.0",
     4877          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
     4878          "dev": true
     4879        },
     4880        "http-signature": {
     4881          "version": "1.2.0",
     4882          "from": "http-signature@>=1.2.0 <1.3.0",
     4883          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
     4884          "dev": true
     4885        },
     4886        "mime-db": {
     4887          "version": "1.44.0",
     4888          "from": "mime-db@1.44.0",
     4889          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
     4890          "dev": true
     4891        },
     4892        "mime-types": {
     4893          "version": "2.1.27",
     4894          "from": "mime-types@>=2.1.19 <2.2.0",
     4895          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
     4896          "dev": true
     4897        },
     4898        "oauth-sign": {
     4899          "version": "0.9.0",
     4900          "from": "oauth-sign@>=0.9.0 <0.10.0",
     4901          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
     4902          "dev": true
     4903        },
     4904        "punycode": {
     4905          "version": "2.1.1",
     4906          "from": "punycode@^2.1.1",
     4907          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
     4908          "dev": true
     4909        },
     4910        "qs": {
     4911          "version": "6.5.2",
     4912          "from": "qs@>=6.5.2 <6.6.0",
     4913          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
     4914          "dev": true
     4915        },
     4916        "request": {
     4917          "version": "2.88.2",
     4918          "from": "request@>=2.88.0 <3.0.0",
     4919          "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
     4920          "dev": true
     4921        },
     4922        "tough-cookie": {
     4923          "version": "2.5.0",
     4924          "from": "tough-cookie@>=2.5.0 <2.6.0",
     4925          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
     4926          "dev": true
     4927        },
     4928        "tunnel-agent": {
     4929          "version": "0.6.0",
     4930          "from": "tunnel-agent@>=0.6.0 <0.7.0",
     4931          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
     4932          "dev": true
     4933        },
     4934        "uuid": {
     4935          "version": "3.4.0",
     4936          "from": "uuid@>=3.3.2 <4.0.0",
     4937          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
     4938          "dev": true
     4939        }
     4940      }
     4941    },
    46784942    "ware": {
    46794943      "version": "1.3.0",

  • branches/4.7/package.json

    r49417 r49532  
    1414  "devDependencies": {
    1515    "autoprefixer": "^6.5.1",
     16    "dotenv": "^8.2.0",
     17    "dotenv-expand": "^5.1.0",
    1618    "grunt": "~0.4.5",
    1719    "grunt-browserify": "~5.0.0",
     20    "grunt-cli": "0.1.13",
    1821    "grunt-contrib-clean": "~1.0.0",
    1922    "grunt-contrib-compress": "~1.3.0",
    … …  
    3336    "grunt-rtlcss": "~2.0.1",
    3437    "grunt-sass": "~1.2.1",
    35     "matchdep": "~1.0.0"
     38    "matchdep": "~1.0.0",
     39    "wait-on": "~3.2.0"
     40  },
     41  "scripts": {
     42    "build": "grunt build",
     43    "build:dev": "grunt build --dev",
     44    "dev": "grunt watch --dev",
     45    "test": "grunt test",
     46    "watch": "grunt watch",
     47    "grunt": "grunt",
     48    "env:start": "node ./tools/local-env/scripts/start.js",
     49    "env:stop": "node ./tools/local-env/scripts/docker.js down",
     50    "env:restart": "npm run env:stop && npm run env:start",
     51    "env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans",
     52    "env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans",
     53    "env:install": "node ./tools/local-env/scripts/install.js",
     54    "env:cli": "node ./tools/local-env/scripts/docker.js run cli",
     55    "env:logs": "node ./tools/local-env/scripts/docker.js logs",
     56    "env:pull": "node ./tools/local-env/scripts/docker.js pull",
     57    "test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit"
    3658  }
    3759}

  • branches/4.7/tests/phpunit/tests/ajax/CustomizeMenus.php

    r39507 r49532  
    5555        if ( 'administrator' != $role ) {
    5656            // If we're not an admin, we should get a wp_die(-1).
    57             $this->setExpectedException( 'WPAjaxDieStopException' );
     57            $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
    5858        }
    5959
    … …  
    430430        if ( 'administrator' != $role ) {
    431431            // If we're not an admin, we should get a wp_die(-1).
    432             $this->setExpectedException( 'WPAjaxDieStopException' );
     432            $this->setExpectedException( 'WPAjaxDieStopException', '-1' );
    433433        }
    434434

  • branches/4.7/tests/phpunit/tests/image/editor_imagick.php

    r49521 r49532  
    466466
    467467        $this->assertNotInstanceOf( 'WP_Error', $editor );
    468        
     468
    469469        $editor->load();
    470470        $editor->resize( 5, 5 );
Note: See TracChangeset for help on using the changeset viewer.