Timber 2.x

.gitignore

@@ -6,15 +6,14 @@
 /database-backups/
 /conifer
 
+# test artifacts
+/test/wp/
+/test/wp-tests-lib/
+
 # build artifacts
 /conifer-*.tar.gz
 /conifer-*.zip
 
-# cypress test artifacts
-/cypress/videos
-/cypress/screenshots
-.Trash*
-
 # yarn artifacts, or "yartifacts"
 yarn-error.log
 
@@ -27,6 +26,6 @@ wp-cli.local.yml
 /docs/reference/*.md
 /docs/node_modules/
 
-
 # VS code
-.vscode/*
+.vscode/*
+.idea

.lando.yml

@@ -1,39 +1,33 @@
 name: conifer
-stats:
-  - report: false
 recipe: wordpress
 config:
   webroot: wp
-  php: '7.0'
+  php: '8.2'
 
 services:
   node:
     type: node:14
 
   appserver:
     run_as_root:
-      # Temporary hack to get a Debian package to install
-      # https://github.com/lando/lando/issues/1554
-      - echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
-      - echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list
-      - sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
-
       - apt-get update
-      - apt-get install zip
+      - apt-get install subversion -y
 
     run:
       - composer install
       - ./scripts/setup-wordpress.sh
 
-    overrides:
-      environment:
-        # Pass any non-empty CI envvar from the host into Lando
-        # This is so we can force non-interactive mode setting up WP
-        CI: ${CI:-''}
-
   database:
     type: mysql:5.7
 
+  testdb:
+    type: mysql:5.7
+    portforward: true
+    creds:
+      user: test
+      password: test
+      database: test
+
   gitbook:
     type: node:10
 
@@ -59,60 +53,84 @@ services:
       - appserver
 
   docs:
-    type: nginx:1.17
+    type: nginx:1.18
     ssl: true
     webroot: docs/_book
 
 tooling:
+  clean:
+    service: appserver
+    cmd: 'rm -rf node_modules vendor *.tar.gz *.zip wp'
+
   install:
     service: appserver
     cmd: './scripts/setup-wordpress.sh'
     description: 'Install and configure WordPress for custom plugin dev'
 
-  install-test-themes:
-    service: appserver
-    cmd: 'rsync --verbose --archive --recursive ./test/themes/ ./wp/wp-content/themes/'
-    description: 'Sync test themes for e2e testing'
-
   debug:
     service: appserver
     cmd: 'tail -f ./wp/wp-content/debug.log'
     description: 'Get real-time WP debug log output'
 
-  cypress:
-    service: cypress
-    cmd: 'yarn cypress'
-    description: 'Run arbitrary cypress commands'
-
-  e2e:
-    service: cypress
-    cmd: 'yarn cypress run'
-    description: 'Run end-to-end tests'
-
   unit:
     service: appserver
-    cmd: './vendor/bin/phpunit'
+    cmd: './vendor/bin/phpunit --config phpunit.xml.dist'
     description: 'Run unit tests'
 
-  sniff:
+  integration:
+    service: appserver
+    cmd: './vendor/bin/phpunit --config phpunit-integration.xml.dist'
+    description: 'Run integration tests'
+
+  test:
     service: appserver
-    cmd: 'composer sniff'
-    description: 'Run phpcs code sniffer'
+    cmd:
+      - vendor/bin/phpunit --config phpunit.xml.dist
+      - vendor/bin/phpunit --config phpunit-integration.xml.dist
+    description: 'Run all unit and integration tests'
+
+  install-tests:
+    service: appserver
+    cmd: './scripts/install-wp-tests.sh'
+    description: 'Install the WP Unit Test suite'
 
   sniff-summary:
     service: appserver
-    cmd: 'composer sniff-summary'
-    description: 'Summarize phpcs results'
+    cmd: './vendor/bin/phpcs --report=summary --standard=./phpcs.xml test lib'
+    description: 'Summarize PHPCS code sniffer findings'
+
+  sniff:
+    service: appserver
+    cmd: './vendor/bin/phpcs --standard=./phpcs.xml test lib'
+    description: 'Run PHPCS code sniffer on all test and production code'
 
   sniff-fix:
     service: appserver
-    cmd: 'composer sniff-fix'
-    description: 'Fix coding standards issues that are automatically fixable'
+    cmd: './vendor/bin/phpcbf --standard=./phpcs.xml test lib'
+    description: 'Fix all automatically fixable issues found by PHPCS'
+
+  analyze:
+    service: appserver
+    cmd: './vendor/bin/phpstan analyse'
+    description: 'Run phpstan coding standards (level 1)'
 
-  release:
+  analyse:
     service: appserver
-    cmd: './scripts/build-release.sh'
-    description: 'Build a downloadable release of the Conifer WordPress plugin'
+    cmd: './vendor/bin/phpstan analyse'
+    description: 'Run phpstan coding standards (level 1)'
+
+  ci:
+    service: appserver
+    cmd:
+      - vendor/bin/phpunit --config phpunit.xml.dist
+      - vendor/bin/phpunit --config phpunit-integration.xml.dist
+      - vendor/bin/phpcs --standard=phpcs.xml test lib
+      - vendor/bin/phpstan analyze
+
+  phpstan:
+    service: appserver
+    cmd: './vendor/bin/phpstan'
+    description: 'Run phpstan commands for static analysis'
 
   docs:
     service: gitbook
@@ -128,19 +146,12 @@ events:
   pre-docs:
     - appserver: './scripts/build-api-md.sh'
 
-  pre-e2e:
-    - appserver: 'echo installing test themes...'
-    - appserver: 'rsync --verbose --archive --recursive ./test/themes/ ./wp/wp-content/themes/'
-
 proxy:
   appserver:
     - conifer.lndo.site
 
   mailhog:
     - mail.conifer.lndo.site
 
-  phpmyadmin:
-    - phpmyadmin.conifer.lndo.site
-
   docs:
     - docs.conifer.lndo.site

.travis.yml

@@ -1,49 +1,40 @@
-#
-# Conifer build process for Travis CI
-#
-
-
-#
-# !!! IMPORTANT !!!
-#
-# "without the top-level `env`, no job will be allowed to fail."
-# https://docs.travis-ci.com/user/customizing-the-build/
-env:
-
+# TravisCI configuration for sitecrafting/conifer
 
 language: php
-
-install:
-  - composer install --prefer-dist
-  - if [ $TIMBER_VERSION ] ; then composer require timber/timber:$TIMBER_VERSION; fi
-
-script:
-  - vendor/bin/phpunit
-  - vendor/bin/phpcs
+os:
+  - linux
+dist: bionic
 
 php:
-  - '7.0'
-  - '7.1'
-  - '7.2'
-  - '7.3'
+  - '7.4'
 
-env:
-  - TIMBER_VERSION='' # default to whatever is declared in composer.lock
-  - TIMBER_VERSION='2.x-dev'
+cache:
+  directories:
+    - '${HOME}/.composer/cache'
 
-# Test Conifer against PHP 7.x and run end-to-end tests
-matrix:
+jobs:
   include:
+    - php: '7.4'
     - name: 'Building docs'
       language: node_js
       node_js: 10
-      cache:
-        - ~/.cache
       install:
         - yarn install --frozen-lockfile
       script:
         - ./scripts/build-docs.sh
 
-  allow_failures:
-    - env: TIMBER_VERSION='2.x-dev'
+addons:
+  apt:
+    packages:
+      - subversion
 
+install:
+  - composer install --no-interaction --prefer-dist
+  # TODO
+  # - scrips/install-wp-tests.sh
+
+script:
+  - vendor/bin/phpunit --config phpunit.xml.dist
+  - vendor/bin/phpunit --config phpunit-integration.xml.dist
+  - vendor/bin/phpcs --standard=./phpcs.xml test lib
+  - vendor/bin/phpstan analyse

README.md

@@ -3,12 +3,6 @@
 [![Build Status](https://travis-ci.org/sitecrafting/conifer.svg?branch=main)](https://travis-ci.org/github/sitecrafting/conifer)
 [![Packagist Version](https://img.shields.io/packagist/v/sitecrafting/conifer.svg)](https://packagist.org/packages/sitecrafting/conifer)
 
-#### :warning: ALPHA STATUS
-
-> Conifer is in Alpha. We consider the code production-ready, and breaking changes to the API are unlikely. Most of the code has been extracted from components already running in production.
->
-> **However, there may be lingering bugs and, if necessary, breaking changes at this early stage.**
-
 ## Documentation
 
 For reference documentation, use-cases, and design principles, [check out the docs](https://www.coniferplug.in/).

composer.json

@@ -20,22 +20,34 @@
   ],
   "minimum-stability": "dev",
   "require": {
-    "php": ">=7.0"
+    "php": ">=7.2",
+    "timber/timber": "^2.1"
   },
   "require-dev": {
-    "10up/wp_mock": "dev-dev",
-    "phpunit/phpunit": "^6.0",
     "mikey179/vfsstream": "~1",
     "behat/behat": "^3.4",
-    "johnpbloch/wordpress-core-installer": "^2.0",
-    "johnpbloch/wordpress-core": "^5.8",
+    "johnpbloch/wordpress-core": "6.5.5",
     "mnsami/composer-custom-directory-installer": "^2.0",
-    "sitecrafting/groot": "dev-master",
+    "sitecrafting/groot": "dev-timber-2.x",
     "squizlabs/php_codesniffer": "3.*",
-    "timber/timber": "^1.7",
     "wp-coding-standards/wpcs": "^2.3",
     "acobster/wp-cli-yaml-fixtures": "^0.5.0",
-    "victorjonsson/markdowndocs": "dev-master"
+    "victorjonsson/markdowndocs": "dev-master",
+    "szepeviktor/phpstan-wordpress": "^1.3",
+    "paulthewalton/acf-stubs": "^5.8.7",
+    "johnpbloch/wordpress-core-installer": "dev-master",
+    "phpunit/phpunit": "^8",
+    "10up/wp_mock": "dev-dev"
+  },
+  "config": {
+    "platform": {
+      "php": "8.2"
+    },
+    "allow-plugins": {
+      "composer/installers": true,
+      "mnsami/composer-custom-directory-installer": true,
+      "johnpbloch/wordpress-core-installer": true
+    }
   },
   "extra": {
     "wordpress-install-dir": {
@@ -52,10 +64,21 @@
       "Conifer\\": "lib/Conifer/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "ConiferTest\\": "test/unit/",
+      "ConiferTestSupport\\": "test/support/",
+      "Conifer\\Unit\\": "test/unit/",
+      "Conifer\\Unit\\Support\\": "test/support/"
+    }
+  },
   "scripts": {
-    "test": [
+    "unit": [
       "./vendor/bin/phpunit"
       ],
+      "phpstan": [
+      "./vendor/bin/phpstan analyse"
+      ],
       "sniff-summary": [
         "./vendor/bin/phpcs --report=summary --standard=./phpcs.xml conifer.php test lib"
       ],