Changeset 2933043 for pressidium-cookie-consent

Timestamp:

07/02/2023 04:01:22 PM (3 years ago)

Author:

pressidium

Message:

Update to version 1.0.4 from GitHub

Location:

pressidium-cookie-consent

Files:

• tags/1.0.4 (copied) (copied from pressidium-cookie-consent/trunk)
• tags/1.0.4/includes/Admin/Page.php (modified) (1 diff)
• tags/1.0.4/includes/Admin/Settings/Settings_Page.php (modified) (4 diffs)
• tags/1.0.4/pressidium-cookie-consent.php (modified) (2 diffs)
• tags/1.0.4/readme.txt (modified) (2 diffs)
• tags/1.0.4/vendor/autoload.php (modified) (1 diff)
• tags/1.0.4/vendor/composer/autoload_real.php (modified) (2 diffs)
• tags/1.0.4/vendor/composer/autoload_static.php (modified) (2 diffs)
• trunk/includes/Admin/Page.php (modified) (1 diff)
• trunk/includes/Admin/Settings/Settings_Page.php (modified) (4 diffs)
• trunk/pressidium-cookie-consent.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/vendor/autoload.php (modified) (1 diff)
• trunk/vendor/composer/autoload_real.php (modified) (2 diffs)
• trunk/vendor/composer/autoload_static.php (modified) (2 diffs)

pressidium-cookie-consent/tags/1.0.4/includes/Admin/Page.php

@@ -82 +82 @@
      * @return string
      */
-    protected function get_icon() {
+    protected function get_icon(): string {
         return 'dashicons-admin-generic';
     }

pressidium-cookie-consent/tags/1.0.4/includes/Admin/Settings/Settings_Page.php

@@ -100 +100 @@
      * @return string
      */
-    protected function get_icon() {
+    protected function get_icon(): string {
+        // phpcs:ignore Generic.Files.LineLength
         return 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0xNTguNywxNDAuNzJjLTIuNzIsMi4yNC03LjI1LDYuNC05LjE2LDExLjJhMzIuNjIsMzIuNjIsMCwwLDAtMS44NiwxMS4yNCwyMS42MSwyMS42MSwwLDAsMCwuMTYsMi44NGMyLjg0LDUsMTIuMDcsNS40NywxNy4xLDUuMDgsNS43LS40NSwxNC4yNC0yLjMzLDE3LjkyLTcuMTRhMjIuNjMsMjIuNjMsMCwwLDAsMy41OS04LjEsMTguODMsMTguODMsMCwwLDAsMC0xMC43MUMxODMuNTIsMTM2LjE3LDE3MC4xNCwxMzMuODYsMTU4LjcsMTQwLjcyWiIvPjxwYXRoIGQ9Ik05Ny40MiwxNDAuNzJjLTExLjQzLTYuODYtMjQuODItNC41NS0yNy43Niw0LjQxYTE4Ljc1LDE4Ljc1LDAsMCwwLDAsMTAuNzEsMjIuNTQsMjIuNTQsMCwwLDAsMy42LDguMWMzLjY3LDQuODEsMTIuMjEsNi42OSwxNy45MSw3LjE0LDUsLjM5LDE0LjI2LS4xLDE3LjExLTUuMDhhMjMsMjMsMCwwLDAsLjE1LTIuODQsMzIuMzgsMzIuMzgsMCwwLDAtMS44Ni0xMS4yNEMxMDQuNjcsMTQ3LjEyLDEwMC4xNCwxNDMsOTcuNDIsMTQwLjcyWiIvPjxwYXRoIGQ9Ik0xNDkuMjUsMTUzLjdoMGMtLjA4LjIzLS4xNi40Ni0uMjMuNjlDMTQ5LjA5LDE1NC4xNywxNDkuMTcsMTUzLjk0LDE0OS4yNSwxNTMuN1oiLz48Y2lyY2xlIGN4PSIxOTQuMzIiIGN5PSI1Ni4yMSIgcj0iOC4yNyIvPjxjaXJjbGUgY3g9IjE4OC45OSIgY3k9Ijg3LjIyIiByPSI3Ljc0Ii8+PGNpcmNsZSBjeD0iMjI1LjI4IiBjeT0iOTguMDQiIHI9IjUuMjkiLz48cGF0aCBkPSJNMjIwLjY3LDEzMC42OGEyMywyMywwLDAsMS00LjY1LjQ3LDIzLjI5LDIzLjI5LDAsMCwxLTE3LjktOC4zNmwtMS4wOC40N2EzNC4zMSwzNC4zMSwwLDAsMSw1LjE5LDkuMThjNC4xMiwxMC44OCw2LDI3LjcyLjUsMzguNzgtMTMsLjMyLTQyLjgxLDUuNjMtNjEuNjgsMTAuMi0xLjE2LjI4LS41NC4xMiwwLDBoLTIuMjRjLS40NS0xLjMyLTEuNDctNS43Ny0xLjI5LTE5LjA4LjI0LTE4LjA2LDkuNTgtMzcuNDQsMjUuMzgtNDZhMzEsMzEsMCwwLDEtNS4zOC0zNS42OCwyMy4zLDIzLjMsMCwwLDEtMTQuMTMtMjRjLTEuODYtLjE5LTMuNzYtLjM1LTUuNzItLjQ3TDE0MSw1MS40NWwtMzAuNjksNS40YTk5LjYzLDk5LjYzLDAsMCwwLTI1LjUzLDYuMzRjLTYuOTEtNy44NS0yMy4xLTIwLjgtNTUuNDEtMjIuMywwLDAtNywzOC41NSwxMC45MSw3My4zMy01LjExLDE1LTcuNTYsMjkuODMtMTEuNDIsNDAuMTQtLjA3LjE4LS4xMy4zNS0uMi41Mi0uMTMuMzUtLjI3LjctLjQxLDFzLS4xOS40Ni0uMjguNjhsLS4zLjY4Yy0uMTMuMy0uMjcuNi0uNDEuODlzLS4xNS4zMi0uMjMuNDdjLS4xNi4zNC0uMzMuNjctLjUxLDFsLS4yMS4zOGMtLjE4LjM0LS4zNy42Ni0uNTYsMWwtLjE4LjI5LS42LjkyLS4xNS4yYy0uMi4zLS40Mi41OC0uNjQuODVhMS4zMywxLjMzLDAsMCwxLS4xNC4xOWMtLjI0LjI5LS40OC41Ni0uNzMuODNsLS4xNy4xOGMtLjI1LjI2LS41LjUxLS43Ny43NWwtLjE3LjE1Yy0uMjcuMjMtLjU1LjQ2LS44My42N2EuNzEuNzEsMCwwLDAtLjE0LjFjLS4zMS4yMS0uNjEuNDItLjkzLjYxaDBjLS4zMy4xOS0uNjUuMzUtMSwuNTFsLS4wOCwwYy0uMzguMTYtLjcyLjI5LTEuMDYuNGwtLjE5LjA2Yy0uMzQuMTEtLjcuMi0xLjA2LjI4bC0uMTksMGMtLjM3LjA3LS43NS4xMy0xLjE0LjE3aC0uMTVjLS40MiwwLS44NC4wNi0xLjI4LjA2aDBjLjA5LjIxLjE5LjQxLjI4LjYydjBDMjkuNjUsMjAyLjM5LDgwLjE5LDIyNywxMjgsMjI3aDBjNDcuOCwwLDk4LjI4LTI0LjU2LDExMy41OC01Ny45MWwuMTYtLjA5LjA1LDBoMGwwLDAsLjA4LDBjMC0uMTksMC0uMzgsMC0uNThDMjI5LDE2OC4zMiwyMjYsMTUxLjQsMjIwLjY3LDEzMC42OFpNNTMuOSwxMzIuNDRjNi0xNS44NiwyMi4wNS0yNC44MSwzOC4xMS0xNi44LDE2LjU1LDguMjUsMjYuMzksMjguMTcsMjYuNjMsNDYuNy4xOCwxMy4zMS0uODQsMTcuNzYtMS4yOSwxOS4wOGgtMi4yNGMuNS4xMiwxLjEyLjI4LDAsMC0xOC44Ny00LjU3LTQ4LjcyLTkuODgtNjEuNjgtMTAuMkM0Ny45LDE2MC4xNiw0OS43NywxNDMuMzIsNTMuOSwxMzIuNDRaTTE0MiwxOTEuNzNsLTQuMjgsMi4xOWExNSwxNSwwLDAsMS0xOS4zLDBsLTQuMjgtMi4xOWMtMi40Mi0yLTEtNC41OSwyLjE3LTQuNTloMjMuNTJDMTQzLDE4Ny4xNCwxNDQuNDIsMTg5LjcsMTQyLDE5MS43M1oiLz48L2c+PC9zdmc+';
     }
@@ -177 +178 @@
      * Add information about this plugin to the left side of the admin footer.
      *
-     * @param string $content The existing content.
-     *
-     * @return string The modified content including the plugin information.
-     */
-    public function admin_footer_info( string $content ): string {
+     * @param string|null $content The existing content.
+     *
+     * @return string|null The modified content including the plugin information.
+     */
+    public function admin_footer_info( ?string $content ): ?string {
         if ( ! $this->is_settings_page() ) {
             // Not the settings page, bail early
@@ -191 +192 @@
             sprintf(
                 /* translators: 1: Developer name, 2: Link to the docs. */
-                __( 'Developed by %s | For more information, read the %s.', 'pressidium-cookie-consent' ),
+                __( 'Developed by %1$s | For more information, read the %2$s.', 'pressidium-cookie-consent' ),
                 sprintf(
-                    '<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>',
+                    '<a href="%1$s" target="_blank" rel="noopener noreferrer">%2$s</a>',
                     esc_url( 'https://pressidium.com/' ),
                     esc_html( 'Pressidium' )
                 ),
                 sprintf(
-                    '<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>',
+                    '<a href="%1$s" target="_blank" rel="noopener noreferrer">%2$s</a>',
                     esc_url( 'https://github.com/pressidium/pressidium-cookie-consent/wiki' ),
                     __( 'documentation', 'pressidium-cookie-consent' )
@@ -209 +210 @@
      * Add plugin version to the right side of the admin footer.
      *
-     * @param string $content The existing content.
-     *
-     * @return string The modified content including the plugin version.
-     */
-    public function admin_footer_version( string $content ): string {
+     * @param string|null $content The existing content.
+     *
+     * @return string|null The modified content including the plugin version.
+     */
+    public function admin_footer_version( ?string $content ): ?string {
         if ( ! $this->is_settings_page() ) {
             // Not the settings page, bail early

pressidium-cookie-consent/tags/1.0.4/pressidium-cookie-consent.php

@@ -4 +4 @@
  * Plugin URI: https://github.com/pressidium/pressidium-cookie-consent/
  * Description: Lightweight, user-friendly and customizable cookie consent banner to help you comply with the EU GDPR cookie law and CCPA regulations.
- * Version: 1.0.3
+ * Version: 1.0.4
  * Author: Pressidium
  * Author URI: https://pressidium.com/
@@ -28 +28 @@
 function setup_constants(): void {
     if ( ! defined( 'Pressidium\WP\CookieConsent\VERSION' ) ) {
-        define( 'Pressidium\WP\CookieConsent\VERSION', '1.0.3' );
+        define( 'Pressidium\WP\CookieConsent\VERSION', '1.0.4' );
     }
 

pressidium-cookie-consent/tags/1.0.4/readme.txt

@@ -7 +7 @@
 Tested up to: 6.2
 Requires PHP: 7.4
-Stable Tag: 1.0.3
+Stable Tag: 1.0.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -146 +146 @@
 == Changelog ==
 
+= 1.0.4: Jul 2, 2023 =
+
+* Fix a conflict with plugins that use `null` as their admin footer text
+
 = 1.0.3: Jun 30, 2023 =
 

pressidium-cookie-consent/tags/1.0.4/vendor/autoload.php

@@ -23 +23 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitb51892c4c46d36cfbc552d247a0591ef::getLoader();
+return ComposerAutoloaderInitc5842229a7b0b697ca6ad6294ebebd9d::getLoader();

pressidium-cookie-consent/tags/1.0.4/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitb51892c4c46d36cfbc552d247a0591ef
+class ComposerAutoloaderInitc5842229a7b0b697ca6ad6294ebebd9d
 {
     private static $loader;
@@ -25 +25 @@
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitb51892c4c46d36cfbc552d247a0591ef', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitc5842229a7b0b697ca6ad6294ebebd9d', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitb51892c4c46d36cfbc552d247a0591ef', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitc5842229a7b0b697ca6ad6294ebebd9d', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d::getInitializer($loader));
 
         $loader->register(true);

pressidium-cookie-consent/tags/1.0.4/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef
+class ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d
 {
     public static $prefixLengthsPsr4 = array (
@@ -41 +41 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d::$classMap;
 
         }, null, ClassLoader::class);

pressidium-cookie-consent/trunk/includes/Admin/Page.php

@@ -82 +82 @@
      * @return string
      */
-    protected function get_icon() {
+    protected function get_icon(): string {
         return 'dashicons-admin-generic';
     }

pressidium-cookie-consent/trunk/includes/Admin/Settings/Settings_Page.php

@@ -100 +100 @@
      * @return string
      */
-    protected function get_icon() {
+    protected function get_icon(): string {
+        // phpcs:ignore Generic.Files.LineLength
         return 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGQ9Ik0xNTguNywxNDAuNzJjLTIuNzIsMi4yNC03LjI1LDYuNC05LjE2LDExLjJhMzIuNjIsMzIuNjIsMCwwLDAtMS44NiwxMS4yNCwyMS42MSwyMS42MSwwLDAsMCwuMTYsMi44NGMyLjg0LDUsMTIuMDcsNS40NywxNy4xLDUuMDgsNS43LS40NSwxNC4yNC0yLjMzLDE3LjkyLTcuMTRhMjIuNjMsMjIuNjMsMCwwLDAsMy41OS04LjEsMTguODMsMTguODMsMCwwLDAsMC0xMC43MUMxODMuNTIsMTM2LjE3LDE3MC4xNCwxMzMuODYsMTU4LjcsMTQwLjcyWiIvPjxwYXRoIGQ9Ik05Ny40MiwxNDAuNzJjLTExLjQzLTYuODYtMjQuODItNC41NS0yNy43Niw0LjQxYTE4Ljc1LDE4Ljc1LDAsMCwwLDAsMTAuNzEsMjIuNTQsMjIuNTQsMCwwLDAsMy42LDguMWMzLjY3LDQuODEsMTIuMjEsNi42OSwxNy45MSw3LjE0LDUsLjM5LDE0LjI2LS4xLDE3LjExLTUuMDhhMjMsMjMsMCwwLDAsLjE1LTIuODQsMzIuMzgsMzIuMzgsMCwwLDAtMS44Ni0xMS4yNEMxMDQuNjcsMTQ3LjEyLDEwMC4xNCwxNDMsOTcuNDIsMTQwLjcyWiIvPjxwYXRoIGQ9Ik0xNDkuMjUsMTUzLjdoMGMtLjA4LjIzLS4xNi40Ni0uMjMuNjlDMTQ5LjA5LDE1NC4xNywxNDkuMTcsMTUzLjk0LDE0OS4yNSwxNTMuN1oiLz48Y2lyY2xlIGN4PSIxOTQuMzIiIGN5PSI1Ni4yMSIgcj0iOC4yNyIvPjxjaXJjbGUgY3g9IjE4OC45OSIgY3k9Ijg3LjIyIiByPSI3Ljc0Ii8+PGNpcmNsZSBjeD0iMjI1LjI4IiBjeT0iOTguMDQiIHI9IjUuMjkiLz48cGF0aCBkPSJNMjIwLjY3LDEzMC42OGEyMywyMywwLDAsMS00LjY1LjQ3LDIzLjI5LDIzLjI5LDAsMCwxLTE3LjktOC4zNmwtMS4wOC40N2EzNC4zMSwzNC4zMSwwLDAsMSw1LjE5LDkuMThjNC4xMiwxMC44OCw2LDI3LjcyLjUsMzguNzgtMTMsLjMyLTQyLjgxLDUuNjMtNjEuNjgsMTAuMi0xLjE2LjI4LS41NC4xMiwwLDBoLTIuMjRjLS40NS0xLjMyLTEuNDctNS43Ny0xLjI5LTE5LjA4LjI0LTE4LjA2LDkuNTgtMzcuNDQsMjUuMzgtNDZhMzEsMzEsMCwwLDEtNS4zOC0zNS42OCwyMy4zLDIzLjMsMCwwLDEtMTQuMTMtMjRjLTEuODYtLjE5LTMuNzYtLjM1LTUuNzItLjQ3TDE0MSw1MS40NWwtMzAuNjksNS40YTk5LjYzLDk5LjYzLDAsMCwwLTI1LjUzLDYuMzRjLTYuOTEtNy44NS0yMy4xLTIwLjgtNTUuNDEtMjIuMywwLDAtNywzOC41NSwxMC45MSw3My4zMy01LjExLDE1LTcuNTYsMjkuODMtMTEuNDIsNDAuMTQtLjA3LjE4LS4xMy4zNS0uMi41Mi0uMTMuMzUtLjI3LjctLjQxLDFzLS4xOS40Ni0uMjguNjhsLS4zLjY4Yy0uMTMuMy0uMjcuNi0uNDEuODlzLS4xNS4zMi0uMjMuNDdjLS4xNi4zNC0uMzMuNjctLjUxLDFsLS4yMS4zOGMtLjE4LjM0LS4zNy42Ni0uNTYsMWwtLjE4LjI5LS42LjkyLS4xNS4yYy0uMi4zLS40Mi41OC0uNjQuODVhMS4zMywxLjMzLDAsMCwxLS4xNC4xOWMtLjI0LjI5LS40OC41Ni0uNzMuODNsLS4xNy4xOGMtLjI1LjI2LS41LjUxLS43Ny43NWwtLjE3LjE1Yy0uMjcuMjMtLjU1LjQ2LS44My42N2EuNzEuNzEsMCwwLDAtLjE0LjFjLS4zMS4yMS0uNjEuNDItLjkzLjYxaDBjLS4zMy4xOS0uNjUuMzUtMSwuNTFsLS4wOCwwYy0uMzguMTYtLjcyLjI5LTEuMDYuNGwtLjE5LjA2Yy0uMzQuMTEtLjcuMi0xLjA2LjI4bC0uMTksMGMtLjM3LjA3LS43NS4xMy0xLjE0LjE3aC0uMTVjLS40MiwwLS44NC4wNi0xLjI4LjA2aDBjLjA5LjIxLjE5LjQxLjI4LjYydjBDMjkuNjUsMjAyLjM5LDgwLjE5LDIyNywxMjgsMjI3aDBjNDcuOCwwLDk4LjI4LTI0LjU2LDExMy41OC01Ny45MWwuMTYtLjA5LjA1LDBoMGwwLDAsLjA4LDBjMC0uMTksMC0uMzgsMC0uNThDMjI5LDE2OC4zMiwyMjYsMTUxLjQsMjIwLjY3LDEzMC42OFpNNTMuOSwxMzIuNDRjNi0xNS44NiwyMi4wNS0yNC44MSwzOC4xMS0xNi44LDE2LjU1LDguMjUsMjYuMzksMjguMTcsMjYuNjMsNDYuNy4xOCwxMy4zMS0uODQsMTcuNzYtMS4yOSwxOS4wOGgtMi4yNGMuNS4xMiwxLjEyLjI4LDAsMC0xOC44Ny00LjU3LTQ4LjcyLTkuODgtNjEuNjgtMTAuMkM0Ny45LDE2MC4xNiw0OS43NywxNDMuMzIsNTMuOSwxMzIuNDRaTTE0MiwxOTEuNzNsLTQuMjgsMi4xOWExNSwxNSwwLDAsMS0xOS4zLDBsLTQuMjgtMi4xOWMtMi40Mi0yLTEtNC41OSwyLjE3LTQuNTloMjMuNTJDMTQzLDE4Ny4xNCwxNDQuNDIsMTg5LjcsMTQyLDE5MS43M1oiLz48L2c+PC9zdmc+';
     }
@@ -177 +178 @@
      * Add information about this plugin to the left side of the admin footer.
      *
-     * @param string $content The existing content.
-     *
-     * @return string The modified content including the plugin information.
-     */
-    public function admin_footer_info( string $content ): string {
+     * @param string|null $content The existing content.
+     *
+     * @return string|null The modified content including the plugin information.
+     */
+    public function admin_footer_info( ?string $content ): ?string {
         if ( ! $this->is_settings_page() ) {
             // Not the settings page, bail early
@@ -191 +192 @@
             sprintf(
                 /* translators: 1: Developer name, 2: Link to the docs. */
-                __( 'Developed by %s | For more information, read the %s.', 'pressidium-cookie-consent' ),
+                __( 'Developed by %1$s | For more information, read the %2$s.', 'pressidium-cookie-consent' ),
                 sprintf(
-                    '<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>',
+                    '<a href="%1$s" target="_blank" rel="noopener noreferrer">%2$s</a>',
                     esc_url( 'https://pressidium.com/' ),
                     esc_html( 'Pressidium' )
                 ),
                 sprintf(
-                    '<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>',
+                    '<a href="%1$s" target="_blank" rel="noopener noreferrer">%2$s</a>',
                     esc_url( 'https://github.com/pressidium/pressidium-cookie-consent/wiki' ),
                     __( 'documentation', 'pressidium-cookie-consent' )
@@ -209 +210 @@
      * Add plugin version to the right side of the admin footer.
      *
-     * @param string $content The existing content.
-     *
-     * @return string The modified content including the plugin version.
-     */
-    public function admin_footer_version( string $content ): string {
+     * @param string|null $content The existing content.
+     *
+     * @return string|null The modified content including the plugin version.
+     */
+    public function admin_footer_version( ?string $content ): ?string {
         if ( ! $this->is_settings_page() ) {
             // Not the settings page, bail early

pressidium-cookie-consent/trunk/pressidium-cookie-consent.php

@@ -4 +4 @@
  * Plugin URI: https://github.com/pressidium/pressidium-cookie-consent/
  * Description: Lightweight, user-friendly and customizable cookie consent banner to help you comply with the EU GDPR cookie law and CCPA regulations.
- * Version: 1.0.3
+ * Version: 1.0.4
  * Author: Pressidium
  * Author URI: https://pressidium.com/
@@ -28 +28 @@
 function setup_constants(): void {
     if ( ! defined( 'Pressidium\WP\CookieConsent\VERSION' ) ) {
-        define( 'Pressidium\WP\CookieConsent\VERSION', '1.0.3' );
+        define( 'Pressidium\WP\CookieConsent\VERSION', '1.0.4' );
     }
 

pressidium-cookie-consent/trunk/readme.txt

@@ -7 +7 @@
 Tested up to: 6.2
 Requires PHP: 7.4
-Stable Tag: 1.0.3
+Stable Tag: 1.0.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -146 +146 @@
 == Changelog ==
 
+= 1.0.4: Jul 2, 2023 =
+
+* Fix a conflict with plugins that use `null` as their admin footer text
+
 = 1.0.3: Jun 30, 2023 =
 

pressidium-cookie-consent/trunk/vendor/autoload.php

@@ -23 +23 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitb51892c4c46d36cfbc552d247a0591ef::getLoader();
+return ComposerAutoloaderInitc5842229a7b0b697ca6ad6294ebebd9d::getLoader();

pressidium-cookie-consent/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitb51892c4c46d36cfbc552d247a0591ef
+class ComposerAutoloaderInitc5842229a7b0b697ca6ad6294ebebd9d
 {
     private static $loader;
@@ -25 +25 @@
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitb51892c4c46d36cfbc552d247a0591ef', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitc5842229a7b0b697ca6ad6294ebebd9d', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitb51892c4c46d36cfbc552d247a0591ef', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitc5842229a7b0b697ca6ad6294ebebd9d', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d::getInitializer($loader));
 
         $loader->register(true);

pressidium-cookie-consent/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef
+class ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d
 {
     public static $prefixLengthsPsr4 = array (
@@ -41 +41 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitb51892c4c46d36cfbc552d247a0591ef::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitc5842229a7b0b697ca6ad6294ebebd9d::$classMap;
 
         }, null, ClassLoader::class);