WordPress.org
Get WordPress

Plugin Directory

Changeset 3473914


Ignore:
Timestamp:
03/03/2026 06:25:09 PM (4 weeks ago)
Author:
kaggdesign
Message:

Update to version 2.2.0 from GitHub

Location:
kagg-pagespeed-module
Files:
16 edited
1 copied

Legend:

Unmodified
Added
Removed

  • kagg-pagespeed-module/tags/2.2.0/mod-pagespeed.php

    r3048396 r3473914  
    1111 * Plugin URI:           https://wordpress.org/plugins/kagg-pagespeed-module/
    1212 * Description:          Support of PageSpeed Module for Apache or Nginx.
    13  * Version:              2.1.0
    14  * Requires at least:    4.4
    15  * Requires PHP:         7.0
     13 * Version:              2.2.0
     14 * Requires at least:    6.0
     15 * Requires PHP:         7.4
    1616 * Author:               KAGG Design
    1717 * Author URI:           https://kagg.eu/en/
    … …  
    2828}
    2929
    30 if ( defined( 'MOD_PAGESPEED_VERSION' ) ) {
    31     return;
    32 }
    33 
    3430/**
    3531 * Plugin version.
    3632 */
    37 const MOD_PAGESPEED_VERSION = '2.1.0';
     33const MOD_PAGESPEED_VERSION = '2.2.0';
    3834
    3935/**
    … …  
    5551
    5652/**
    57  * Get main class instance.
     53 * Get a main class instance.
    5854 *
    5955 * @return Main
    6056 */
    61 function kagg_pagespeed_module() {
     57function kagg_pagespeed_module(): Main {
    6258    static $mod_pagespeed;
    6359

  • kagg-pagespeed-module/tags/2.2.0/readme.txt

    r3048396 r3473914  
    33Donate link: https://kagg.eu/en/
    44Tags: PageSpeed Module, mod_pagespeed, Apache, Nginx, cache
    5 Requires at least: 5.0
    6 Tested up to: 6.5
    7 Requires PHP: 7.0
    8 Stable tag: 2.1.0
     5Requires at least: 6.0
     6Tested up to: 6.9
     7Requires PHP: 7.4
     8Stable tag: 2.2.0
    99License: GPLv2 or later
    1010License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    2424= Minimum Requirements =
    2525
    26 * PHP version 7.0 or greater (PHP 8.0 or greater is recommended)
     26* PHP version 7.4 or greater (PHP 8.0 or greater is recommended)
    2727* MySQL version 5.5 or greater (MySQL 5.6 or greater is recommended)
    2828* PageSpeed Module for Apache or Nginx
    … …  
    4545
    4646== Changelog ==
     47
     48= 2.2.0 =
     49* The minimal required PHP version is now 7.4.
     50* The minimum required WordPress version is now 6.0.
     51* Tested with WordPress 6.9.
    4752
    4853= 2.1.0 =

  • kagg-pagespeed-module/tags/2.2.0/src/php/Main.php

    r3048396 r3473914  
    1818     * @var array
    1919     */
    20     private $options;
     20    private array $options;
    2121
    2222    /**
    2323     * Admin screen id.
    2424     */
    25     const SCREEN_ID = 'settings_page_mod-pagespeed';
     25    private const SCREEN_ID = 'settings_page_mod-pagespeed';
    2626
    2727    /**
    2828     * Option page.
    2929     */
    30     const PAGE = 'mod-pagespeed';
     30    private const PAGE = 'mod-pagespeed';
    3131
    3232    /**
    3333     * Ajax action name.
    3434     */
    35     const ACTION = 'mod-pagespeed-action';
     35    private const ACTION = 'mod-pagespeed-action';
    3636
    3737    /**
    3838     * Admin script handle.
    3939     */
    40     const HANDLE = 'mod-pagespeed-admin';
     40    private const HANDLE = 'mod-pagespeed-admin';
    4141
    4242    /**
    4343     * Init class.
    4444     */
    45     public function init() {
    46         $this->options = get_option( 'mod_pagespeed_settings', [] );
     45    public function init(): void {
     46        $this->options = (array) get_option( 'mod_pagespeed_settings', [] );
    4747
    4848        $this->hooks();
    … …  
    5454     * @return void
    5555     */
    56     private function hooks() {
     56    private function hooks(): void {
    5757        add_action( 'admin_menu', [ $this, 'add_settings_page' ] );
    5858        add_filter(
    … …  
    7272     * Add the settings page to the menu.
    7373     */
    74     public function add_settings_page() {
     74    public function add_settings_page(): void {
    7575        $page_title = __( 'PageSpeed', 'kagg-pagespeed-module' );
    7676        $menu_title = __( 'PageSpeed', 'kagg-pagespeed-module' );
    … …  
    8888     * Options page.
    8989     */
    90     public function mod_pagespeed_settings_page() {
     90    public function mod_pagespeed_settings_page(): void {
    9191        ?>
    9292        <div class="wrap">
    … …  
    111111     * Setup options fields.
    112112     */
    113     public function setup_fields() {
     113    public function setup_fields(): void {
    114114        add_settings_section(
    115115            'purge_section',
    … …  
    129129     * Purge Cache section.
    130130     */
    131     public function mod_pagespeed_purge_section() {
     131    public function mod_pagespeed_purge_section(): void {
    132132        $title       = __( 'Purge Styles', 'kagg-pagespeed-module' );
    133         $text        = __( 'Clear cached version of the current WordPress theme style.css file.<br><br>This is useful when styles were changed.', 'kagg-pagespeed-module' );
     133        $text        = __( 'Clear cached version of the current WordPress theme style.css file.<br><br>This is useful when styles are changed.', 'kagg-pagespeed-module' );
    134134        $button_text = __( 'Purge Styles', 'kagg-pagespeed-module' );
     135
    135136        $this->card_section( $title, $text, $button_text, 'purge_styles' );
    136137
    137138        $title       = __( 'Purge Entire Cache', 'kagg-pagespeed-module' );
    138         $text        = __( 'Clear the entire PageSpeed cache on site. This action fetches fresh versions of all pages, images, and scripts on your website.<br><br>Please note that PageSpeed module will take some time to re-create cache after several page visits.', 'kagg-pagespeed-module' );
     139        $text        = __( 'Clear the entire PageSpeed cache on site. This action fetches fresh versions of all pages, images, and scripts on your website.<br><br>Please note that the PageSpeed module will take some time to re-create the cache after several page visits.', 'kagg-pagespeed-module' );
    139140        $button_text = __( 'Purge Entire Cache', 'kagg-pagespeed-module' );
     141
    140142        $this->card_section( $title, $text, $button_text, 'purge_entire_cache' );
    141143    }
    … …  
    149151     * @param string $button_id   Button id.
    150152     */
    151     private function card_section( $title, $text, $button_text, $button_id ) {
     153    private function card_section( string $title, string $text, string $button_text, string $button_id ): void {
    152154        ?>
    153155        <section class="ps-card">
    … …  
    170172     * Development Mode section.
    171173     */
    172     public function mod_pagespeed_development_section() {
     174    public function mod_pagespeed_development_section(): void {
    173175        $title    = __( 'Development Mode', 'kagg-pagespeed-module' );
    174176        $text     =
    … …  
    201203        </section>
    202204        <?php
     205
    203206        echo '<div id="ps-success"></div>';
    204207        echo '<div id="ps-error"></div>';
    … …  
    208211     * Load plugin text domain.
    209212     */
    210     public function load_textdomain() {
     213    public function load_textdomain(): void {
    211214        load_plugin_textdomain(
    212215            'kagg-pagespeed-module',
    … …  
    219222     * Enqueue plugin scripts.
    220223     */
    221     public function admin_enqueue_scripts() {
     224    public function admin_enqueue_scripts(): void {
    222225        if ( ! is_admin() ) {
    223226            return;
    … …  
    267270     * Process ajax request.
    268271     */
    269     public function ajax_action() {
     272    public function ajax_action(): void {
    270273        if (
    271274        ! wp_verify_nonce(
    … …  
    308311     * Purge cache for $link.
    309312     *
    310      * @param string $link a link to file or * to be purged.
    311      */
    312     private function purge_link( $link ) {
     313     * @param string $link a link to the file or * to be purged.
     314     */
     315    private function purge_link( string $link ): void {
    313316        $result = wp_remote_request( site_url() );
    314317
    … …  
    373376     * For any site url, add or remove ?ModPagespeed argument.
    374377     */
    375     public function mod_pagespeed_arg() {
     378    public function mod_pagespeed_arg(): void {
    376379        if ( wp_doing_ajax() || is_admin() || $this->is_rest() ) {
    377380            return;
    … …  
    417420
    418421    /**
    419      * Add link to plugin setting page on plugins page.
     422     * Add a link to the plugin setting page on the plugins page.
    420423     *
    421424     * @param array|mixed $links Plugin links.

  • kagg-pagespeed-module/tags/2.2.0/vendor/autoload.php

    r3048396 r3473914  
    1515        }
    1616    }
    17     trigger_error(
    18         $err,
    19         E_USER_ERROR
    20     );
     17    throw new RuntimeException($err);
    2118}
    2219
    2320require_once __DIR__ . '/composer/autoload_real.php';
    2421
    25 return ComposerAutoloaderInit03ce483e1e15a7655bd7af9251265c6d::getLoader();
     22return ComposerAutoloaderInit24a70a51a122ec3bcea93c270850275b::getLoader();

  • kagg-pagespeed-module/tags/2.2.0/vendor/composer/InstalledVersions.php

    r2947379 r3473914  
    2828{
    2929    /**
     30     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
     31     * @internal
     32     */
     33    private static $selfDir = null;
     34
     35    /**
    3036     * @var mixed[]|null
    3137     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
    3238     */
    3339    private static $installed;
     40
     41    /**
     42     * @var bool
     43     */
     44    private static $installedIsLocalDir;
    3445
    3546    /**
    … …  
    310321        self::$installed = $data;
    311322        self::$installedByVendor = array();
     323
     324        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
     325        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
     326        // so we have to assume it does not, and that may result in duplicate data being returned when listing
     327        // all installed packages for example
     328        self::$installedIsLocalDir = false;
     329    }
     330
     331    /**
     332     * @return string
     333     */
     334    private static function getSelfDir()
     335    {
     336        if (self::$selfDir === null) {
     337            self::$selfDir = strtr(__DIR__, '\\', '/');
     338        }
     339
     340        return self::$selfDir;
    312341    }
    313342
    … …  
    323352
    324353        $installed = array();
     354        $copiedLocalDir = false;
    325355
    326356        if (self::$canGetVendors) {
     357            $selfDir = self::getSelfDir();
    327358            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
     359                $vendorDir = strtr($vendorDir, '\\', '/');
    328360                if (isset(self::$installedByVendor[$vendorDir])) {
    329361                    $installed[] = self::$installedByVendor[$vendorDir];
    … …  
    331363                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
    332364                    $required = require $vendorDir.'/composer/installed.php';
    333                     $installed[] = self::$installedByVendor[$vendorDir] = $required;
    334                     if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
    335                         self::$installed = $installed[count($installed) - 1];
     365                    self::$installedByVendor[$vendorDir] = $required;
     366                    $installed[] = $required;
     367                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
     368                        self::$installed = $required;
     369                        self::$installedIsLocalDir = true;
    336370                    }
     371                }
     372                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
     373                    $copiedLocalDir = true;
    337374                }
    338375            }
    … …  
    351388        }
    352389
    353         if (self::$installed !== array()) {
     390        if (self::$installed !== array() && !$copiedLocalDir) {
    354391            $installed[] = self::$installed;
    355392        }

  • kagg-pagespeed-module/tags/2.2.0/vendor/composer/autoload_real.php

    r3048396 r3473914  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInit03ce483e1e15a7655bd7af9251265c6d
     5class ComposerAutoloaderInit24a70a51a122ec3bcea93c270850275b
    66{
    77    private static $loader;
    … …  
    2323        }
    2424
    25         spl_autoload_register(array('ComposerAutoloaderInit03ce483e1e15a7655bd7af9251265c6d', 'loadClassLoader'), true, true);
     25        spl_autoload_register(array('ComposerAutoloaderInit24a70a51a122ec3bcea93c270850275b', 'loadClassLoader'), true, true);
    2626        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
    27         spl_autoload_unregister(array('ComposerAutoloaderInit03ce483e1e15a7655bd7af9251265c6d', 'loadClassLoader'));
     27        spl_autoload_unregister(array('ComposerAutoloaderInit24a70a51a122ec3bcea93c270850275b', 'loadClassLoader'));
    2828
    2929        require __DIR__ . '/autoload_static.php';
    30         call_user_func(\Composer\Autoload\ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d::getInitializer($loader));
     30        call_user_func(\Composer\Autoload\ComposerStaticInit24a70a51a122ec3bcea93c270850275b::getInitializer($loader));
    3131
    3232        $loader->setClassMapAuthoritative(true);

  • kagg-pagespeed-module/tags/2.2.0/vendor/composer/autoload_static.php

    r3048396 r3473914  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d
     7class ComposerStaticInit24a70a51a122ec3bcea93c270850275b
    88{
    99    public static $prefixLengthsPsr4 = array (
    10         'K' => 
     10        'K' =>
    1111        array (
    1212            'KAGG\\PagespeedModule\\' => 21,
    … …  
    1515
    1616    public static $prefixDirsPsr4 = array (
    17         'KAGG\\PagespeedModule\\' => 
     17        'KAGG\\PagespeedModule\\' =>
    1818        array (
    1919            0 => __DIR__ . '/../..' . '/src/php',
    … …  
    2929    {
    3030        return \Closure::bind(function () use ($loader) {
    31             $loader->prefixLengthsPsr4 = ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d::$prefixLengthsPsr4;
    32             $loader->prefixDirsPsr4 = ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d::$prefixDirsPsr4;
    33             $loader->classMap = ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d::$classMap;
     31            $loader->prefixLengthsPsr4 = ComposerStaticInit24a70a51a122ec3bcea93c270850275b::$prefixLengthsPsr4;
     32            $loader->prefixDirsPsr4 = ComposerStaticInit24a70a51a122ec3bcea93c270850275b::$prefixDirsPsr4;
     33            $loader->classMap = ComposerStaticInit24a70a51a122ec3bcea93c270850275b::$classMap;
    3434
    3535        }, null, ClassLoader::class);

  • kagg-pagespeed-module/tags/2.2.0/vendor/composer/installed.php

    r3048396 r3473914  
    22    'root' => array(
    33        'name' => 'kagg/pagespeed-module',
    4         'pretty_version' => '2.1.0',
    5         'version' => '2.1.0.0',
    6         'reference' => '8a3027be44a1e24da6acfb2bccc03a519fe95a27',
     4        'pretty_version' => '2.2.0',
     5        'version' => '2.2.0.0',
     6        'reference' => 'd4f11585291becd2b5377fc981753699a5149ad3',
    77        'type' => 'wordpress-plugin',
    88        'install_path' => __DIR__ . '/../../',
    … …  
    1212    'versions' => array(
    1313        'kagg/pagespeed-module' => array(
    14             'pretty_version' => '2.1.0',
    15             'version' => '2.1.0.0',
    16             'reference' => '8a3027be44a1e24da6acfb2bccc03a519fe95a27',
     14            'pretty_version' => '2.2.0',
     15            'version' => '2.2.0.0',
     16            'reference' => 'd4f11585291becd2b5377fc981753699a5149ad3',
    1717            'type' => 'wordpress-plugin',
    1818            'install_path' => __DIR__ . '/../../',

  • kagg-pagespeed-module/trunk/mod-pagespeed.php

    r3048396 r3473914  
    1111 * Plugin URI:           https://wordpress.org/plugins/kagg-pagespeed-module/
    1212 * Description:          Support of PageSpeed Module for Apache or Nginx.
    13  * Version:              2.1.0
    14  * Requires at least:    4.4
    15  * Requires PHP:         7.0
     13 * Version:              2.2.0
     14 * Requires at least:    6.0
     15 * Requires PHP:         7.4
    1616 * Author:               KAGG Design
    1717 * Author URI:           https://kagg.eu/en/
    … …  
    2828}
    2929
    30 if ( defined( 'MOD_PAGESPEED_VERSION' ) ) {
    31     return;
    32 }
    33 
    3430/**
    3531 * Plugin version.
    3632 */
    37 const MOD_PAGESPEED_VERSION = '2.1.0';
     33const MOD_PAGESPEED_VERSION = '2.2.0';
    3834
    3935/**
    … …  
    5551
    5652/**
    57  * Get main class instance.
     53 * Get a main class instance.
    5854 *
    5955 * @return Main
    6056 */
    61 function kagg_pagespeed_module() {
     57function kagg_pagespeed_module(): Main {
    6258    static $mod_pagespeed;
    6359

  • kagg-pagespeed-module/trunk/readme.txt

    r3048396 r3473914  
    33Donate link: https://kagg.eu/en/
    44Tags: PageSpeed Module, mod_pagespeed, Apache, Nginx, cache
    5 Requires at least: 5.0
    6 Tested up to: 6.5
    7 Requires PHP: 7.0
    8 Stable tag: 2.1.0
     5Requires at least: 6.0
     6Tested up to: 6.9
     7Requires PHP: 7.4
     8Stable tag: 2.2.0
    99License: GPLv2 or later
    1010License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    2424= Minimum Requirements =
    2525
    26 * PHP version 7.0 or greater (PHP 8.0 or greater is recommended)
     26* PHP version 7.4 or greater (PHP 8.0 or greater is recommended)
    2727* MySQL version 5.5 or greater (MySQL 5.6 or greater is recommended)
    2828* PageSpeed Module for Apache or Nginx
    … …  
    4545
    4646== Changelog ==
     47
     48= 2.2.0 =
     49* The minimal required PHP version is now 7.4.
     50* The minimum required WordPress version is now 6.0.
     51* Tested with WordPress 6.9.
    4752
    4853= 2.1.0 =

  • kagg-pagespeed-module/trunk/src/php/Main.php

    r3048396 r3473914  
    1818     * @var array
    1919     */
    20     private $options;
     20    private array $options;
    2121
    2222    /**
    2323     * Admin screen id.
    2424     */
    25     const SCREEN_ID = 'settings_page_mod-pagespeed';
     25    private const SCREEN_ID = 'settings_page_mod-pagespeed';
    2626
    2727    /**
    2828     * Option page.
    2929     */
    30     const PAGE = 'mod-pagespeed';
     30    private const PAGE = 'mod-pagespeed';
    3131
    3232    /**
    3333     * Ajax action name.
    3434     */
    35     const ACTION = 'mod-pagespeed-action';
     35    private const ACTION = 'mod-pagespeed-action';
    3636
    3737    /**
    3838     * Admin script handle.
    3939     */
    40     const HANDLE = 'mod-pagespeed-admin';
     40    private const HANDLE = 'mod-pagespeed-admin';
    4141
    4242    /**
    4343     * Init class.
    4444     */
    45     public function init() {
    46         $this->options = get_option( 'mod_pagespeed_settings', [] );
     45    public function init(): void {
     46        $this->options = (array) get_option( 'mod_pagespeed_settings', [] );
    4747
    4848        $this->hooks();
    … …  
    5454     * @return void
    5555     */
    56     private function hooks() {
     56    private function hooks(): void {
    5757        add_action( 'admin_menu', [ $this, 'add_settings_page' ] );
    5858        add_filter(
    … …  
    7272     * Add the settings page to the menu.
    7373     */
    74     public function add_settings_page() {
     74    public function add_settings_page(): void {
    7575        $page_title = __( 'PageSpeed', 'kagg-pagespeed-module' );
    7676        $menu_title = __( 'PageSpeed', 'kagg-pagespeed-module' );
    … …  
    8888     * Options page.
    8989     */
    90     public function mod_pagespeed_settings_page() {
     90    public function mod_pagespeed_settings_page(): void {
    9191        ?>
    9292        <div class="wrap">
    … …  
    111111     * Setup options fields.
    112112     */
    113     public function setup_fields() {
     113    public function setup_fields(): void {
    114114        add_settings_section(
    115115            'purge_section',
    … …  
    129129     * Purge Cache section.
    130130     */
    131     public function mod_pagespeed_purge_section() {
     131    public function mod_pagespeed_purge_section(): void {
    132132        $title       = __( 'Purge Styles', 'kagg-pagespeed-module' );
    133         $text        = __( 'Clear cached version of the current WordPress theme style.css file.<br><br>This is useful when styles were changed.', 'kagg-pagespeed-module' );
     133        $text        = __( 'Clear cached version of the current WordPress theme style.css file.<br><br>This is useful when styles are changed.', 'kagg-pagespeed-module' );
    134134        $button_text = __( 'Purge Styles', 'kagg-pagespeed-module' );
     135
    135136        $this->card_section( $title, $text, $button_text, 'purge_styles' );
    136137
    137138        $title       = __( 'Purge Entire Cache', 'kagg-pagespeed-module' );
    138         $text        = __( 'Clear the entire PageSpeed cache on site. This action fetches fresh versions of all pages, images, and scripts on your website.<br><br>Please note that PageSpeed module will take some time to re-create cache after several page visits.', 'kagg-pagespeed-module' );
     139        $text        = __( 'Clear the entire PageSpeed cache on site. This action fetches fresh versions of all pages, images, and scripts on your website.<br><br>Please note that the PageSpeed module will take some time to re-create the cache after several page visits.', 'kagg-pagespeed-module' );
    139140        $button_text = __( 'Purge Entire Cache', 'kagg-pagespeed-module' );
     141
    140142        $this->card_section( $title, $text, $button_text, 'purge_entire_cache' );
    141143    }
    … …  
    149151     * @param string $button_id   Button id.
    150152     */
    151     private function card_section( $title, $text, $button_text, $button_id ) {
     153    private function card_section( string $title, string $text, string $button_text, string $button_id ): void {
    152154        ?>
    153155        <section class="ps-card">
    … …  
    170172     * Development Mode section.
    171173     */
    172     public function mod_pagespeed_development_section() {
     174    public function mod_pagespeed_development_section(): void {
    173175        $title    = __( 'Development Mode', 'kagg-pagespeed-module' );
    174176        $text     =
    … …  
    201203        </section>
    202204        <?php
     205
    203206        echo '<div id="ps-success"></div>';
    204207        echo '<div id="ps-error"></div>';
    … …  
    208211     * Load plugin text domain.
    209212     */
    210     public function load_textdomain() {
     213    public function load_textdomain(): void {
    211214        load_plugin_textdomain(
    212215            'kagg-pagespeed-module',
    … …  
    219222     * Enqueue plugin scripts.
    220223     */
    221     public function admin_enqueue_scripts() {
     224    public function admin_enqueue_scripts(): void {
    222225        if ( ! is_admin() ) {
    223226            return;
    … …  
    267270     * Process ajax request.
    268271     */
    269     public function ajax_action() {
     272    public function ajax_action(): void {
    270273        if (
    271274        ! wp_verify_nonce(
    … …  
    308311     * Purge cache for $link.
    309312     *
    310      * @param string $link a link to file or * to be purged.
    311      */
    312     private function purge_link( $link ) {
     313     * @param string $link a link to the file or * to be purged.
     314     */
     315    private function purge_link( string $link ): void {
    313316        $result = wp_remote_request( site_url() );
    314317
    … …  
    373376     * For any site url, add or remove ?ModPagespeed argument.
    374377     */
    375     public function mod_pagespeed_arg() {
     378    public function mod_pagespeed_arg(): void {
    376379        if ( wp_doing_ajax() || is_admin() || $this->is_rest() ) {
    377380            return;
    … …  
    417420
    418421    /**
    419      * Add link to plugin setting page on plugins page.
     422     * Add a link to the plugin setting page on the plugins page.
    420423     *
    421424     * @param array|mixed $links Plugin links.

  • kagg-pagespeed-module/trunk/vendor/autoload.php

    r3048396 r3473914  
    1515        }
    1616    }
    17     trigger_error(
    18         $err,
    19         E_USER_ERROR
    20     );
     17    throw new RuntimeException($err);
    2118}
    2219
    2320require_once __DIR__ . '/composer/autoload_real.php';
    2421
    25 return ComposerAutoloaderInit03ce483e1e15a7655bd7af9251265c6d::getLoader();
     22return ComposerAutoloaderInit24a70a51a122ec3bcea93c270850275b::getLoader();

  • kagg-pagespeed-module/trunk/vendor/composer/InstalledVersions.php

    r2947379 r3473914  
    2828{
    2929    /**
     30     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
     31     * @internal
     32     */
     33    private static $selfDir = null;
     34
     35    /**
    3036     * @var mixed[]|null
    3137     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
    3238     */
    3339    private static $installed;
     40
     41    /**
     42     * @var bool
     43     */
     44    private static $installedIsLocalDir;
    3445
    3546    /**
    … …  
    310321        self::$installed = $data;
    311322        self::$installedByVendor = array();
     323
     324        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
     325        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
     326        // so we have to assume it does not, and that may result in duplicate data being returned when listing
     327        // all installed packages for example
     328        self::$installedIsLocalDir = false;
     329    }
     330
     331    /**
     332     * @return string
     333     */
     334    private static function getSelfDir()
     335    {
     336        if (self::$selfDir === null) {
     337            self::$selfDir = strtr(__DIR__, '\\', '/');
     338        }
     339
     340        return self::$selfDir;
    312341    }
    313342
    … …  
    323352
    324353        $installed = array();
     354        $copiedLocalDir = false;
    325355
    326356        if (self::$canGetVendors) {
     357            $selfDir = self::getSelfDir();
    327358            foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
     359                $vendorDir = strtr($vendorDir, '\\', '/');
    328360                if (isset(self::$installedByVendor[$vendorDir])) {
    329361                    $installed[] = self::$installedByVendor[$vendorDir];
    … …  
    331363                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
    332364                    $required = require $vendorDir.'/composer/installed.php';
    333                     $installed[] = self::$installedByVendor[$vendorDir] = $required;
    334                     if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
    335                         self::$installed = $installed[count($installed) - 1];
     365                    self::$installedByVendor[$vendorDir] = $required;
     366                    $installed[] = $required;
     367                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
     368                        self::$installed = $required;
     369                        self::$installedIsLocalDir = true;
    336370                    }
     371                }
     372                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
     373                    $copiedLocalDir = true;
    337374                }
    338375            }
    … …  
    351388        }
    352389
    353         if (self::$installed !== array()) {
     390        if (self::$installed !== array() && !$copiedLocalDir) {
    354391            $installed[] = self::$installed;
    355392        }

  • kagg-pagespeed-module/trunk/vendor/composer/autoload_real.php

    r3048396 r3473914  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInit03ce483e1e15a7655bd7af9251265c6d
     5class ComposerAutoloaderInit24a70a51a122ec3bcea93c270850275b
    66{
    77    private static $loader;
    … …  
    2323        }
    2424
    25         spl_autoload_register(array('ComposerAutoloaderInit03ce483e1e15a7655bd7af9251265c6d', 'loadClassLoader'), true, true);
     25        spl_autoload_register(array('ComposerAutoloaderInit24a70a51a122ec3bcea93c270850275b', 'loadClassLoader'), true, true);
    2626        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
    27         spl_autoload_unregister(array('ComposerAutoloaderInit03ce483e1e15a7655bd7af9251265c6d', 'loadClassLoader'));
     27        spl_autoload_unregister(array('ComposerAutoloaderInit24a70a51a122ec3bcea93c270850275b', 'loadClassLoader'));
    2828
    2929        require __DIR__ . '/autoload_static.php';
    30         call_user_func(\Composer\Autoload\ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d::getInitializer($loader));
     30        call_user_func(\Composer\Autoload\ComposerStaticInit24a70a51a122ec3bcea93c270850275b::getInitializer($loader));
    3131
    3232        $loader->setClassMapAuthoritative(true);

  • kagg-pagespeed-module/trunk/vendor/composer/autoload_static.php

    r3048396 r3473914  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d
     7class ComposerStaticInit24a70a51a122ec3bcea93c270850275b
    88{
    99    public static $prefixLengthsPsr4 = array (
    10         'K' => 
     10        'K' =>
    1111        array (
    1212            'KAGG\\PagespeedModule\\' => 21,
    … …  
    1515
    1616    public static $prefixDirsPsr4 = array (
    17         'KAGG\\PagespeedModule\\' => 
     17        'KAGG\\PagespeedModule\\' =>
    1818        array (
    1919            0 => __DIR__ . '/../..' . '/src/php',
    … …  
    2929    {
    3030        return \Closure::bind(function () use ($loader) {
    31             $loader->prefixLengthsPsr4 = ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d::$prefixLengthsPsr4;
    32             $loader->prefixDirsPsr4 = ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d::$prefixDirsPsr4;
    33             $loader->classMap = ComposerStaticInit03ce483e1e15a7655bd7af9251265c6d::$classMap;
     31            $loader->prefixLengthsPsr4 = ComposerStaticInit24a70a51a122ec3bcea93c270850275b::$prefixLengthsPsr4;
     32            $loader->prefixDirsPsr4 = ComposerStaticInit24a70a51a122ec3bcea93c270850275b::$prefixDirsPsr4;
     33            $loader->classMap = ComposerStaticInit24a70a51a122ec3bcea93c270850275b::$classMap;
    3434
    3535        }, null, ClassLoader::class);

  • kagg-pagespeed-module/trunk/vendor/composer/installed.php

    r3048396 r3473914  
    22    'root' => array(
    33        'name' => 'kagg/pagespeed-module',
    4         'pretty_version' => '2.1.0',
    5         'version' => '2.1.0.0',
    6         'reference' => '8a3027be44a1e24da6acfb2bccc03a519fe95a27',
     4        'pretty_version' => '2.2.0',
     5        'version' => '2.2.0.0',
     6        'reference' => 'd4f11585291becd2b5377fc981753699a5149ad3',
    77        'type' => 'wordpress-plugin',
    88        'install_path' => __DIR__ . '/../../',
    … …  
    1212    'versions' => array(
    1313        'kagg/pagespeed-module' => array(
    14             'pretty_version' => '2.1.0',
    15             'version' => '2.1.0.0',
    16             'reference' => '8a3027be44a1e24da6acfb2bccc03a519fe95a27',
     14            'pretty_version' => '2.2.0',
     15            'version' => '2.2.0.0',
     16            'reference' => 'd4f11585291becd2b5377fc981753699a5149ad3',
    1717            'type' => 'wordpress-plugin',
    1818            'install_path' => __DIR__ . '/../../',
Note: See TracChangeset for help on using the changeset viewer.