Merge pull request #9670 from awesomemotive/release/3.2.0

Version 3.2.0

.buildkite/pipeline.yml

@@ -1,41 +1,45 @@
 steps:
 
- - label: "Pull PHP 7.1"
- command: "docker pull public.ecr.aws/q7y6e9n2/unit-test-images/php:7.1"
- retry:
- automatic: true
-
- - label: "Pull PHP 7.2"
- command: "docker pull public.ecr.aws/q7y6e9n2/unit-test-images/php:7.2"
- retry:
- automatic: true
-
- - wait
-
- - label: "Pull PHP 7.3"
- command: "docker pull public.ecr.aws/q7y6e9n2/unit-test-images/php:7.3"
+ - label: "Pull PHP 7.4"
+ command: "docker pull -q public.ecr.aws/q7y6e9n2/unit-test-images/php:7.4"
  retry:
  automatic: true
 
- - label: "Pull PHP 7.4"
- command: "docker pull public.ecr.aws/q7y6e9n2/unit-test-images/php:7.4"
+ - label: "Pull PHP 8.0"
+ command: "docker pull -q public.ecr.aws/q7y6e9n2/unit-test-images/php:8.0"
  retry:
  automatic: true
 
  - wait
 
- - label: "Pull PHP 8.0"
- command: "docker pull public.ecr.aws/q7y6e9n2/unit-test-images/php:8.0"
+ - label: "Pull PHP 8.1"
+ command: "docker pull -q public.ecr.aws/q7y6e9n2/unit-test-images/php:8.1"
  retry:
  automatic: true
 
  - label: "Pull MariaDB"
- command: "docker pull mariadb:10.4"
+ command: "docker pull -q mariadb:10.4"
  retry:
  automatic: true
 
  - wait
 
+ - env:
+ TEST_INPLACE: "0"
+ TEST_PHP_VERSION: "7.4"
+ TEST_WP_VERSION: "5.8.6"
+ WP_MULTISITE: "0"
+ COMPOSE_HTTP_TIMEOUT: 180
+ DOCKER_CLIENT_TIMEOUT: 180
+ label: 'PHP: 7.4 | WP: 5.8.6 | Multisite: 0'
+ plugins:
+ - docker-compose#v4.14.0:
+ config: docker-compose-phpunit.yml
+ propagate-environment: true
+ propagate-uid-gid: true
+ skip-pull: true
+ run: wordpress
+
  - env:
  TEST_INPLACE: "0"
  TEST_PHP_VERSION: "{{matrix.php}}"
@@ -49,48 +53,29 @@ steps:
  config: docker-compose-phpunit.yml
  propagate-environment: true
  propagate-uid-gid: true
- pull-retries: 3
+ skip-pull: true
  run: wordpress
  matrix:
  setup: # Max of 6 Dimensions.
  php: # Max of 20 elements.
  - "8.0"
- - "7.4"
+ - "8.1"
  wp:
- - "6.1.1"
+ - "6.1.2"
+ - "6.2.2"
  - "latest"
  multisite:
  - "0"
  adjustments: # Max of 12 adjustments.
  - with:
- php: "8.0"
+ php: "8.1"
  wp: "latest"
  multisite: "1"
  - with:
- php: "7.1"
- wp: "5.4.12"
- multisite: "0"
- - with:
- php: "7.1"
- wp: "5.5.11"
- multisite: "0"
- - with:
- php: "7.1"
- wp: "5.6.10"
- multisite: "0"
- - with:
- php: "7.1"
- wp: "5.7.8"
- multisite: "0"
- - with:
- php: "7.1"
- wp: "5.8.6"
- multisite: "0"
- - with:
- php: "7.2"
+ php: "8.0"
  wp: "5.9.5"
  multisite: "0"
  - with:
- php: "7.3"
+ php: "8.1"
  wp: "6.0.3"
  multisite: "0"

.gitignore

@@ -33,8 +33,11 @@ node_modules
 # Temporary files
 *~
 
-# Stripe
-includes/gateways/stripe
-
 # Blocks
-includes/blocks
+includes/blocks/node_modules
+includes/blocks/package-lock.json
+
+/vendor
+!vendor/autoload.php
+!vendor/composer
+!vendor/symfony/deprecation-contracts

Gruntfile.js

@@ -60,15 +60,23 @@ module.exports = function ( grunt ) {
  'assets/images/**',
  'i18n/**',
  'includes/**',
+ '!includes/blocks/node_modules/**',
+ '!includes/blocks/composer.json',
+ '!includes/blocks/package.json',
  'languages/**',
+ 'libraries/**',
  'templates/**',
  'vendor/**',
  'src/**',
  '*.php',
  '*.txt',
  'assets/pro/js/*.js',
  '!src/Lite/**',
- '!assets/lite/**'
+ '!assets/lite/**',
+ '!vendor/**',
+ 'vendor/autoload.php',
+ 'vendor/composer/**',
+ 'vendor/symfony/deprecation-contracts/**'
  ],
  dest: 'build/<%= pkg.name %>-pro/',
  },
@@ -86,15 +94,24 @@ module.exports = function ( grunt ) {
  '!includes/blocks/pro/**',
  '!includes/blocks/assets/pro/**',
  '!includes/blocks/build/pro/**',
+ '!includes/blocks/node_modules/**',
+ '!includes/blocks/src/pro/**',
+ '!includes/blocks/composer.json',
+ '!includes/blocks/package.json',
  'languages/**',
+ 'libraries/**',
  'templates/**',
  'vendor/**',
  'src/**',
  '*.php',
  '*.txt',
  '!src/Pro/**',
  '!assets/pro/**',
- 'assets/lite/**'
+ 'assets/lite/**',
+ '!vendor/**',
+ 'vendor/autoload.php',
+ 'vendor/composer/**',
+ 'vendor/symfony/deprecation-contracts/**'
  ],
  dest: 'build/<%= pkg.name %>/',
  },
@@ -125,30 +142,6 @@ module.exports = function ( grunt ) {
  },
 
  replace: {
- stripe: {
- options: {
- patterns: [
- {
- match: /edd_stripe_bootstrap/g,
- replacement: 'edd_stripe_core_bootstrap',
- expression: true,
- },
- {
- match: /remove_action(.*);/g,
- replacement: '',
- expression: true,
- }
- ]
- },
- files: [
- {
- expand: true,
- flatten: true,
- src: [ 'includes/gateways/stripe/edd-stripe.php' ],
- dest: 'includes/gateways/stripe'
- }
- ]
- },
  blocks: {
  options: {
  patterns: [

assets/css/admin/chosen/_multi.scss

@@ -17,14 +17,15 @@
  font-family: unset;
  height: unset;
  margin: 0;
- padding: 3px 10px;
+ padding: 3px 24px 3px 10px;
  width: 100% !important;
  }
 
  .spinner {
+ margin: 0;
  position: absolute;
  top: 4px;
- right: -4px;
+ right: 30px;
  }
 
  .chosen-choices li.search-choice {

assets/css/admin/dashboard/_widget.scss

@@ -0,0 +1,110 @@
+.edd_dashboard_widget {
+ display: grid;
+ grid-template-columns: repeat(2, minmax(150px, 1fr));
+ grid-gap: 1em;
+
+ > div:not(.table_left):not(.table_right) {
+ grid-column: span 2;
+ }
+
+ table thead td {
+ border-bottom: 1px solid $wp-border;
+ color: #777;
+ }
+
+ .inside {
+ font-size: 12px;
+ }
+
+ td {
+ padding: 3px 0;
+ }
+
+ .b,
+ .t {
+ line-height: 1.5;
+ vertical-align: middle;
+ }
+
+ .b {
+ text-align: right;
+ }
+
+ .t {
+ font-size: 12px;
+ padding-right: 12px;
+ color: #777;
+ width: 100%;
+ }
+
+ .label_heading {
+ border-top: 1px solid $wp-border;
+ color: #8f8f8f;
+ font-size: 12px;
+ font-weight: normal;
+ display: block;
+ padding-top: 10px;
+ margin: 0 0 8px 12px;
+ }
+
+ .edd_dashboard_widget_subheading {
+ border-top: 1px solid $wp-border;
+ color: #8f8f8f;
+ font-size: 14px;
+ padding-top: 10px;
+ margin: 1em 0 0 0;
+ }
+
+ .edd_dashboard_widget_subheading+.table {
+ margin: 8px 0 0 0;
+ }
+
+ .edd_price_label {
+ background: var(--wp-admin-theme-color);
+ border-radius: 3px;
+ color: white;
+ font-size: 10px;
+ padding: 2px 4px;
+ margin-right: 2px;
+ }
+
+ table {
+ width: 100%;
+ margin-left: 0;
+ margin-bottom: 1em;
+ }
+}
+
+td.edd_order_label {
+ width: 80%;
+}
+
+td.edd_order_price {
+ text-align: right;
+}
+
+@media handheld,
+only screen and (max-width: 1000px) {
+
+ .edd_dashboard_widget .edd-recent-email {
+ display: none;
+ }
+}
+
+.edd-dashboard-notice {
+ grid-column: span 2;
+ padding: 1px;
+ text-align: center;
+ margin: 1em -1em -1em;
+ background-color: $wp-alternate;
+ border: 1px solid $wp-border;
+
+ &--error {
+ background: $wp-red-50;
+ color: $white;
+
+ a {
+ color: $white;
+ }
+ }
+}

assets/css/admin/dashboard/style.scss

@@ -0,0 +1,5 @@
+@import "widget";
+
+body.dashboard_page_edd-upgrades.js .postbox .hndle {
+ cursor: default;
+}