From 98bee9bf081e2c43c8908002d75870c3dfd61b19 Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Thu, 7 Feb 2019 09:01:10 +0000 Subject: [PATCH] Block Editor: Update WordPress Packages to solve PHP 5.2.2 parser incompatibility. Updated: - @wordpress/block-library@2.2.16 - @wordpress/block-serialization-default-parser@2.0.5 - @wordpress/blocks@6.0.7 - @wordpress/edit-post@3.1.11 - @wordpress/editor@9.0.11 - @wordpress/format-library@1.2.14 Props pento. Fixes #46200. git-svn-id: https://develop.svn.wordpress.org/trunk@44729 602fd350-edb4-49c9-b593-d223f7449a82 --- package-lock.json | 62 +++++++++++------------ package.json | 12 ++--- src/wp-includes/class-wp-block-parser.php | 2 +- src/wp-includes/script-loader.php | 12 ++--- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 11e5a05838..7b75735962 100644 --- a/package-lock.json +++ b/package-lock.json @@ -291,20 +291,20 @@ } }, "@wordpress/block-library": { - "version": "2.2.15", - "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.2.15.tgz", - "integrity": "sha512-Vcl1tXD0MHjr238hkFpoI5+ybBxZxS3ChTt3HQq9+4GKaYYLeZTqSkchnmHcDAJ5tJ6tQWQ3dL2w7BbUi6NUuA==", + "version": "2.2.16", + "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.2.16.tgz", + "integrity": "sha512-7HoqV7myTdmClOQZ3MXPQs8FXflqK6krU4Nkx8kyl6/b/gbZSaqJhbeDpZ+w56wOrTTaNi7OrPDH9t2M18nBdA==", "requires": { "@babel/runtime": "^7.0.0", "@wordpress/autop": "^2.0.2", "@wordpress/blob": "^2.1.0", - "@wordpress/blocks": "^6.0.6", + "@wordpress/blocks": "^6.0.7", "@wordpress/components": "^7.0.8", "@wordpress/compose": "^3.0.1", "@wordpress/core-data": "^2.0.17", "@wordpress/data": "^4.2.1", "@wordpress/deprecated": "^2.0.5", - "@wordpress/editor": "^9.0.10", + "@wordpress/editor": "^9.0.11", "@wordpress/element": "^2.1.9", "@wordpress/html-entities": "^2.0.4", "@wordpress/i18n": "^3.1.1", @@ -317,9 +317,9 @@ } }, "@wordpress/block-serialization-default-parser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-2.0.4.tgz", - "integrity": "sha512-qTJRSiTLfPw/BlyxXIOv23ISpoQHNXOjbmC+XBmQNI0Ne/4U8cgAf6/2L8w/b2ZEFE+F5OqlOXuQ+4/QRvOnrA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-2.0.5.tgz", + "integrity": "sha512-SzLHeqfz4G9bgugWQpqRKYZXWXJ87sJ67yiPB004Ev3SoPWiR7waqDmAPO//chCv7mBi+p0kWUnIw4feAq9x5w==", "requires": { "@babel/runtime": "^7.0.0" } @@ -330,14 +330,14 @@ "integrity": "sha512-fLBKNRbnm5OZCseWYEuH2uHR2Sx6vWX9UY9wlu7ba1rQb4xjLEh547+yYs7985udB2pGmUG6JWdBcHAlTkkIqw==" }, "@wordpress/blocks": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-6.0.6.tgz", - "integrity": "sha512-eVLfd7rZ7LlUcfyxL+CRvJeEJHdEe+vWMzMc6Chd6+JCQ23UcH4aUJBDuIWAZWHckLNep1O7NrjJOEIgxkeBOQ==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-6.0.7.tgz", + "integrity": "sha512-k1Hoq2PMTDWDJCPwF8d5RXxi2FZUkg0XvGdFoGT8os2l9PE3NWoZgzzSHnYZhkJhm/P+hKwHWxXk5xNqRBp9Mw==", "requires": { "@babel/runtime": "^7.0.0", "@wordpress/autop": "^2.0.2", "@wordpress/blob": "^2.1.0", - "@wordpress/block-serialization-default-parser": "^2.0.4", + "@wordpress/block-serialization-default-parser": "^2.0.5", "@wordpress/block-serialization-spec-parser": "^2.0.3", "@wordpress/data": "^4.2.1", "@wordpress/dom": "^2.0.8", @@ -478,22 +478,22 @@ } }, "@wordpress/edit-post": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.1.10.tgz", - "integrity": "sha512-i3K4OR7IT/reqVamImLRNFW9rMHCZ7P5OPTG9lPdB/G5h0tV5WJPwQER0wZZhH2kA1/evH7BvdiWY90NPI3e0Q==", + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.1.11.tgz", + "integrity": "sha512-NZucS6HHR7e6e1WQKQabAt2zGjo/TkjWHkg76wspLcnW8JdbRl+VFTIAe2BZOeomRbU03wTb1N6b1UJKs94nkQ==", "requires": { "@babel/runtime": "^7.0.0", "@wordpress/a11y": "^2.0.2", "@wordpress/api-fetch": "^2.2.8", - "@wordpress/block-library": "^2.2.15", - "@wordpress/blocks": "^6.0.6", + "@wordpress/block-library": "^2.2.16", + "@wordpress/blocks": "^6.0.7", "@wordpress/components": "^7.0.8", "@wordpress/compose": "^3.0.1", "@wordpress/core-data": "^2.0.17", "@wordpress/data": "^4.2.1", - "@wordpress/editor": "^9.0.10", + "@wordpress/editor": "^9.0.11", "@wordpress/element": "^2.1.9", - "@wordpress/format-library": "^1.2.13", + "@wordpress/format-library": "^1.2.14", "@wordpress/hooks": "^2.0.5", "@wordpress/i18n": "^3.1.1", "@wordpress/keycodes": "^2.0.6", @@ -507,15 +507,15 @@ } }, "@wordpress/editor": { - "version": "9.0.10", - "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.0.10.tgz", - "integrity": "sha512-Oe87p6nbyVJFEOJx3aqbzKGb8KW+eT2IcA6/KkfkIyeYwkuZunuIJusG+Kl20DFBNHF/kgWfSK3y2Ga2GE8peQ==", + "version": "9.0.11", + "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.0.11.tgz", + "integrity": "sha512-3kyua3fpQOJZYCWk+XfNtuUL8BCwKzmHWbm/5s6bv1so58q/4Ek1ZcEXo5B+KN+2crlg56zX1aNQ4LxiP+hnAA==", "requires": { "@babel/runtime": "^7.0.0", "@wordpress/a11y": "^2.0.2", "@wordpress/api-fetch": "^2.2.8", "@wordpress/blob": "^2.1.0", - "@wordpress/blocks": "^6.0.6", + "@wordpress/blocks": "^6.0.7", "@wordpress/components": "^7.0.8", "@wordpress/compose": "^3.0.1", "@wordpress/core-data": "^2.0.17", @@ -579,14 +579,14 @@ } }, "@wordpress/format-library": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.2.13.tgz", - "integrity": "sha512-zfqspcqlOMbPcsmXrDqIqPHwMFxvVEQKpOqW34bhXJMRkWWvr4DRGpFHNveXFghedGaIYRS8cR8qfgCNckrFzw==", + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.2.14.tgz", + "integrity": "sha512-cPDQR9A1RDy8tBXTeb/BKWLAOQGulfvSRgTFvMv5lwVON1DechvaJzlvz0pAyYM/mUe92dFotNsWr++TaFeYNQ==", "requires": { "@babel/runtime": "^7.0.0", "@wordpress/components": "^7.0.8", "@wordpress/dom": "^2.0.8", - "@wordpress/editor": "^9.0.10", + "@wordpress/editor": "^9.0.11", "@wordpress/element": "^2.1.9", "@wordpress/i18n": "^3.1.1", "@wordpress/keycodes": "^2.0.6", @@ -12378,7 +12378,7 @@ }, "react-autosize-textarea": { "version": "3.0.3", - "resolved": "http://registry.npmjs.org/react-autosize-textarea/-/react-autosize-textarea-3.0.3.tgz", + "resolved": "https://registry.npmjs.org/react-autosize-textarea/-/react-autosize-textarea-3.0.3.tgz", "integrity": "sha512-iOSZK7RUuJ+iEwkJ9rqYciqtjQgrG1CCRFL6h8Bk61kODnRyEq4tS74IgXpI1t4S6jBBZVm+6ugaU+tWTlVxXg==", "requires": { "autosize": "^4.0.0", @@ -15033,9 +15033,9 @@ "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=" }, "tinymce": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.2.tgz", - "integrity": "sha512-ZRoTGG4GAsOI73QPSNkabO7nkoYw9H6cglRB44W2mMkxSiqxYi8WJlgkUphk0fDqo6ZD6r3E+NSP4UHxF2lySg==" + "version": "4.9.3", + "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.3.tgz", + "integrity": "sha512-3IjnswgmzJJSgaJR9+tOPK7UYlHoxv8YzUi8ChqetIt1uljRycyqSu8aq1DOyPc+WJCZi9fWo9fEHCEAIYGaLg==" }, "tmp": { "version": "0.0.33", diff --git a/package.json b/package.json index 25134172f1..1cab431582 100644 --- a/package.json +++ b/package.json @@ -59,9 +59,9 @@ "@wordpress/api-fetch": "^2.2.8", "@wordpress/autop": "^2.0.2", "@wordpress/blob": "^2.1.0", - "@wordpress/block-library": "2.2.15", - "@wordpress/block-serialization-default-parser": "^2.0.4", - "@wordpress/blocks": "^6.0.6", + "@wordpress/block-library": "2.2.16", + "@wordpress/block-serialization-default-parser": "^2.0.5", + "@wordpress/blocks": "^6.0.7", "@wordpress/components": "7.0.8", "@wordpress/compose": "^3.0.1", "@wordpress/core-data": "^2.0.17", @@ -70,11 +70,11 @@ "@wordpress/deprecated": "^2.0.5", "@wordpress/dom": "^2.0.8", "@wordpress/dom-ready": "^2.0.2", - "@wordpress/edit-post": "3.1.10", - "@wordpress/editor": "9.0.10", + "@wordpress/edit-post": "3.1.11", + "@wordpress/editor": "9.0.11", "@wordpress/element": "^2.1.9", "@wordpress/escape-html": "^1.0.1", - "@wordpress/format-library": "1.2.13", + "@wordpress/format-library": "1.2.14", "@wordpress/hooks": "^2.0.5", "@wordpress/html-entities": "^2.0.4", "@wordpress/i18n": "^3.1.1", diff --git a/src/wp-includes/class-wp-block-parser.php b/src/wp-includes/class-wp-block-parser.php index 8b565f1a28..eb4c21a973 100644 --- a/src/wp-includes/class-wp-block-parser.php +++ b/src/wp-includes/class-wp-block-parser.php @@ -410,7 +410,7 @@ class WP_Block_Parser { * match back in PHP to see which one it was. */ $has_match = preg_match( - '/).)*+)?}\s+)?(?\/)?-->/s', + '/).)*+)?}\s+)?(?P\/)?-->/s', $this->document, $matches, PREG_OFFSET_CAPTURE, diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 68eaf42821..b02dfdda27 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -229,9 +229,9 @@ function wp_default_packages_scripts( &$scripts ) { 'annotations' => '1.0.8', 'autop' => '2.0.2', 'blob' => '2.1.0', - 'block-library' => '2.2.15', - 'block-serialization-default-parser' => '2.0.4', - 'blocks' => '6.0.5', + 'block-library' => '2.2.16', + 'block-serialization-default-parser' => '2.0.5', + 'blocks' => '6.0.6', 'components' => '7.0.8', 'compose' => '3.0.1', 'core-data' => '2.0.17', @@ -240,11 +240,11 @@ function wp_default_packages_scripts( &$scripts ) { 'deprecated' => '2.0.5', 'dom' => '2.0.8', 'dom-ready' => '2.0.2', - 'edit-post' => '3.1.10', - 'editor' => '9.0.10', + 'edit-post' => '3.1.11', + 'editor' => '9.0.11', 'element' => '2.1.9', 'escape-html' => '1.0.1', - 'format-library' => '1.2.13', + 'format-library' => '1.2.14', 'hooks' => '2.0.5', 'html-entities' => '2.0.4', 'i18n' => '3.1.1',