diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..33ec8f4
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,370 @@
+# LazyLoad Plugin – Lazy Load Images, Videos, and Iframes
+
+The best free lazy load plugin for WordPress. Lazy load images, videos, and iframes to improve performance and Core Web Vitals scores.
+[Download the plugin on wordpress.org](https://wordpress.org/plugins/rocket-lazy-load/).
+
+## Description
+
+LazyLoad is the best free lazy load plugin for WordPress to lazy load images, videos, and iframes on WordPress. In a nutshell, LazyLoad displays images, videos, and iframes on a page only when they are visible to the user – that’s one crucial way to [speed up your WordPress site](https://wp-rocket.me/blog/guide-to-page-speed-optimization-for-wordpress/) and [optimize images for Google PageSpeed](https://imagify.io/blog/optimize-images-page-speed-google/#lazy-loading).
+
+You can lazy load images in post content or widget text, plus thumbnails, avatars, and smilies. LazyLoad takes care of iframe lazy load, too: you’ll easily replace Youtube iframes with a preview thumbnail to further speed up the loading time of your website.
+
+No JavaScript library such as jQuery is used, and the script weight is less than 10KB.
+
+## Why is lazy loading crucial for performance?
+
+Lazy loading is a key performance technique to make your site faster. You’ll reduce loading time, [improve your Lighthouse performance score](https://wp-rocket.me/lighthouse-performance-score-wordpress/) and [optimize your Core Web Vitals grades](https://wp-rocket.me/google-core-web-vitals-wordpress/).
+
+[Lazy loading your images on WordPress](https://wp-rocket.me/blog/lazy-loading-wordpress-5-5/) will help you achieve a better PageSpeed Insights score for three main reasons:
+
+* You’ll address a specific PageSpeed Insights recommendation: [Defer offscreen images](https://wp-rocket.me/google-core-web-vitals-wordpress/defer-offscreen-images/, which means image lazy loading.
+* You’ll improve the performance of two key metrics: [First Input Delay](https://wp-rocket.me/google-core-web-vitals-wordpress/improve-first-input-delay/) (Core Web Vital) and [Total Blocking Time](https://wp-rocket.me/lighthouse-performance-score-wordpress/reduce-total-blocking-time/) (Lighthouse metric).
+* You’ll [make fewer HTTP requests](https://wp-rocket.me/blog/reduce-http-requests-speed-wordpress-site/) – that is another way to boost your site speed and [improve the Largest Contentful Paint score](https://wp-rocket.me/google-core-web-vitals-wordpress/improve-largest-contentful-paint/) (another Core Web Vital).
+
+Take a look at our complete list of reasons [why you should use lazy loading](https://wp-rocket.me/blog/lazyloading/#section-2). Then, turn on LazyLoad and make your WordPress website faster!
+
+
+## How to build the plugin
+
+In order to build the plugin you need have composer installed.
+
+Once it is the case you can follow these steps:
+- Download the zip from the plugin and unzip in a folder.
+- Move inside that folder and run the command `composer i` to install the full plugin and let the script installing protected dependencies run.
+- Run the command `composer i --no-dev --no-scripts -o` to install a production version from dependencies.
+- Zip back the folder and you have a working version from the plugin.
+
+## Dependencies
+
+LazyLoad script: [https://github.com/verlok/lazyload](https://github.com/verlok/lazyload)
+
+== Installation ==
+
+1. Upload the complete `rocket-lazy-load` folder to the `/wp-content/plugins/` directory
+2. Activate the plugin through the 'Plugins' menu in WordPress
+
+## Frequently Asked Questions
+
+### How can I use native lazyload?
+To use native lazyload on browsers supporting this feature, you need to use the following line:
+
+`add_filter( 'rocket_use_native_lazyload', '__return_true' );`
+
+Browsers that do not support native lazyload will use the JS-based solution as before.
+
+### How can I deactivate Lazy Load on some pages?
+
+You can use the `do_rocket_lazyload` filter.
+
+Here is an example to put in functions.php files that disable lazyload on posts:
+
+`
+add_action( 'wp', 'deactivate_rocket_lazyload_on_single' );
+function deactivate_rocket_lazyload_on_single() {
+if ( is_single() ) {
+add_filter( 'do_rocket_lazyload', '__return_false' );
+}
+}
+`
+
+### How can I deactivate Lazy Load on some images?
+
+Simply add a `data-no-lazy="1"` property in you `img` or `iframe` tag.
+
+You can also use the filters `rocket_lazyload_excluded_attributes` or `rocket_lazyload_excluded_src` to exclude specific patterns.
+
+For iframes, the filter is `rocket_lazyload_iframe_excluded_patterns`.
+
+### How can I change the threshold to trigger the load?
+
+You can use the `rocket_lazyload_threshold` filter.
+
+Code sample:
+
+`
+function rocket_lazyload_custom_threshold( $threshold ) {
+return 100;
+}
+add_filter( 'rocket_lazyload_threshold', 'rocket_lazyload_custom_threshold' );
+`
+
+### I use plugin X and my images don't show anymore
+
+Some plugins are not compatible without lazy loading. Please open a support thread, and we will see how we can solve the issue by excluding lazy loading for this plugin.
+
+### How can I lazy load a background-image?
+
+The plugin will automatically lazy load background-images set with a `style` attribute to a `div` element:
+
+``
+
+You can also apply it manually. The element you want to apply lazy load on must have this specific markup:
+
+`
`
+
+The element must have the class `rocket-lazyload`, and a `data-bg` attribute, which value is the CSS url for the image.
+
+### Where do I report security bugs found in this plugin?
+
+You can report any security bugs found in the source code of the site-reviews plugin through the [Patchstack Vulnerability Disclosure Program](https://patchstack.com/database/vdp/rocket-lazy-load). The Patchstack team will assist you with verification, CVE assignment and take care of notifying the developers of this plugin.
+
+### Related Plugins
+
+* [Imagify: The Best image optimizer](https://imagify.io/?utm_source=wordpress.org&utm_medium=referral&utm_campaign=LazyLoadPlugin) to speed up your website with lighter images.
+* [WP Rocket: Best performance plugin](https://wp-rocket.me/?utm_source=wordpress.org&utm_medium=referral&utm_campaign=LazyLoadPlugin) to speed up your WordPress website.
+* [Heartbeat Control by WP Rocket](https://wordpress.org/plugins/heartbeat-control/): Heartbeat Control by WP Rocket: The best plugin to control the WordPress Heartbeat API and reduce CPU usage.
+* [RocketCDN: The best CDN plugin for WordPress](https://rocketcdn.me/wordpress/) to propel your content at the speed of light – no matter where your users are located in the world.
+* [Increase Max upload file size](https://wordpress.org/plugins/upload-max-file-size/) is the best plugin to increase the upload file size limit to any value with one click.
+
+## Changelog
+= 2.3.8 =
+Enhancement: Launchpad compatibility (see https://github.com/wp-launchpad)
+Enhancement: Raised compatibility with PHP > 7.3
+Bug: Removed `wp-media/rocket-lazyload-common` from vendors
+Enhancement: Raised `wp-media/rocket-lazyload-common` to 3.0
+
+= 2.3.7 =
+Bugfix: Removed `rocket_lazyload_polyfill` filter due to a vulnerability on polyfill
+
+= 2.3.5 =
+Enhancement: Test the plugin with latest version of WordPress v5.9.3
+Enhancement: Change WP readme content.
+
+= 2.3.4 =
+Enhancement: Allow `
` tags to lazyload background images
+Enhancement: Add tag to lazyloaded picture elements
+Bugfix: Prevent a Fatal error related to the League Container package conflict with WooCommerce 4.4
+Bugfix: Update lazyload for background images support for new version of lazyload script
+Bugfix: Correctly apply the rocket-lazyload class on elements with a background-image and an empty class value
+Bugfix: Correctly apply the rocket-lazyloadclass on elements with malformed HTML
+Bugfix: Prevent a display issue with background-images when using different types of quotes around the URL
+Bugfix: Prevent Layout from breaking when .*)\1@iUs', $iframe['atts'], $atts );
+
+ $title = $atts['title'] ?? '';
/**
* Filter the LazyLoad HTML output on Youtube iframes
*
@@ -170,7 +175,7 @@ private function replaceYoutubeThumbnail( $iframe ) {
*
* @param array $html Output that will be printed.
*/
- $youtube_lazyload = apply_filters( 'rocket_lazyload_youtube_html', '<div class="rll-youtube-player" data-src="' . esc_attr( $youtube_url ) . '" data-id="' . esc_attr( $youtube_id ) . '" data-query="' . esc_attr( $query ) . '"></div>' );
+ $youtube_lazyload = apply_filters( 'rocket_lazyload_youtube_html', '<div class="rll-youtube-player" data-src="' . esc_attr( $youtube_url ) . '" data-id="' . esc_attr( $youtube_id ) . '" data-query="' . esc_attr( $query ) . '" data-alt="' . esc_attr( $title ) . '"></div>' );
$youtube_lazyload .= '<noscript>' . $iframe[0] . '</noscript>';
return $youtube_lazyload;
diff --git a/src/Dependencies/RocketLazyload/Image.php b/src/Dependencies/RocketLazyload/Image.php
index bf09538..e86a80c 100644
--- a/src/Dependencies/RocketLazyload/Image.php
+++ b/src/Dependencies/RocketLazyload/Image.php
@@ -1,8 +1,10 @@
<?php
+declare(strict_types=1);
+
/**
* Handles lazyloading of images
*
- * @package RocketLazyload
+ * @package RocketLazyLoadPlugin\Dependencies\RocketLazyload
*/
namespace RocketLazyLoadPlugin\Dependencies\RocketLazyload;
@@ -17,12 +19,11 @@ class Image {
*
* @param string $html Original HTML.
* @param string $buffer Content to parse.
+ * @param bool $use_native Use native lazyload.
* @return string
*/
- public function lazyloadImages( $html, $buffer ) {
- $clean_buffer = preg_replace( '/<script\b(?:[^>]*)>(?:.+)?<\/script>/Umsi', '', $html );
- $clean_buffer = preg_replace( '#<noscript>(?:.+)</noscript>#Umsi', '', $clean_buffer );
- if (! preg_match_all('#<img(?<atts>\s.+)\s?/?>#iUs', $clean_buffer, $images, PREG_SET_ORDER)) {
+ public function lazyloadImages( $html, $buffer, $use_native = true ) {
+ if ( ! preg_match_all( '#<img(?<atts>\s.+)\s?/?>#iUs', $buffer, $images, PREG_SET_ORDER ) ) {
return $html;
}
@@ -35,9 +36,13 @@ public function lazyloadImages( $html, $buffer ) {
continue;
}
- $image_lazyload = $this->replaceImage( $image );
- $image_lazyload .= $this->noscript( $image[0] );
- $html = str_replace( $image[0], $image_lazyload, $html );
+ $image_lazyload = $this->replaceImage( $image, $use_native );
+
+ if ( ! $use_native ) {
+ $image_lazyload .= $this->noscript( $image[0] );
+ }
+
+ $html = str_replace( $image[0], $image_lazyload, $html );
unset( $image_lazyload );
}
@@ -62,17 +67,34 @@ public function lazyloadBackgroundImages( $html, $buffer ) {
continue;
}
- if ( ! preg_match( '#background-image\s*:\s*(?<attr>\s*url\s*\((?<url>[^)]+)\))\s*;?#is', $element['styles'], $url ) ) {
+ /**
+ * Regex to detect bg images inside CSS.
+ *
+ * @param string $regex regex to detect.
+ * @return string
+ */
+ $regex = apply_filters( 'rocket_lazyload_bg_images_regex', 'background-image\s*:\s*(?<attr>\s*url\s*\((?<url>[^)]+)\))\s*;?' );
+
+ if ( @preg_match( "#$regex#is", '' ) === false ) {// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+ $regex = 'background-image\s*:\s*(?<attr>\s*url\s*\((?<url>[^)]+)\))\s*;?';
+ }
+
+ if ( ! preg_match( "#$regex#is", $element['styles'], $url ) ) {
continue;
}
+ if ( preg_match( '#data:image#is', $url['url'], $img ) ) {
+ continue;
+ }
$url['url'] = esc_url(
trim(
- strip_tags(
+ wp_strip_all_tags(
html_entity_decode(
- $url['url'], ENT_QUOTES|ENT_HTML5
+ $url['url'],
+ ENT_QUOTES | ENT_HTML5
)
- ), '\'" '
+ ),
+ '\'" '
)
);
@@ -99,7 +121,7 @@ public function lazyloadBackgroundImages( $html, $buffer ) {
*/
private function addLazyClass( $element ) {
$class = $this->getClasses( $element );
- if ( empty( $class ) ) {
+ if ( empty( $class ) ) {
return preg_replace( '#<(img|div|figure|section|li|span|a)([^>]*)>#is', '<\1 class="rocket-lazyload"\2>', $element );
}
@@ -132,7 +154,7 @@ private function addLazyClass( $element ) {
*/
private function getAttributeQuotes( $attribute_value ) {
$attribute_value = trim( $attribute_value );
- $first_char = $attribute_value[0];
+ $first_char = $attribute_value[0];
if ( '"' === $first_char || "'" === $first_char ) {
return $first_char;
@@ -230,7 +252,7 @@ private function stringToArray( $string, $delimiter = ' ' ) {
}
$array = explode( $delimiter, $string );
- $array = array_map('trim', $array );
+ $array = array_map( 'trim', $array );
// Remove empties.
return array_filter( $array );
@@ -253,25 +275,40 @@ public function lazyloadPictures( $html, $buffer ) {
foreach ( $pictures as $picture ) {
if ( $this->isExcluded( $picture[0], $excluded ) ) {
+ if ( ! preg_match( '#<img(?<atts>\s.+)\s?/?>#iUs', $picture[0], $img ) ) {
+ continue;
+ }
+
+ $img = $this->canLazyload( $img );
+
+ if ( ! $img ) {
+ continue;
+ }
+
+ $nolazy_picture = str_replace( '<img', '<img data-no-lazy=""', $picture[0] );
+ $html = str_replace( $picture[0], $nolazy_picture, $html );
+
continue;
}
if ( preg_match_all( '#<source(?<atts>\s.+)>#iUs', $picture['sources'], $sources, PREG_SET_ORDER ) ) {
- $sources = array_unique( $sources, SORT_REGULAR );
-
$lazy_sources = 0;
+ $sources = array_unique( $sources, SORT_REGULAR );
+ $lazy_picture = $picture[0];
foreach ( $sources as $source ) {
$lazyload_srcset = preg_replace( '/([\s"\'])srcset/i', '\1data-lazy-srcset', $source[0] );
- $html = str_replace( $source[0], $lazyload_srcset, $html );
+ $lazy_picture = str_replace( $source[0], $lazyload_srcset, $lazy_picture );
unset( $lazyload_srcset );
$lazy_sources++;
}
- }
- if ( 0 === $lazy_sources ) {
- continue;
+ if ( 0 === $lazy_sources ) {
+ continue;
+ }
+
+ $html = str_replace( $picture[0], $lazy_picture, $html );
}
if ( ! preg_match( '#<img(?<atts>\s.+)\s?/?>#iUs', $picture[0], $img ) ) {
@@ -284,10 +321,10 @@ public function lazyloadPictures( $html, $buffer ) {
continue;
}
- $img_lazy = $this->replaceImage( $img );
+ $img_lazy = $this->replaceImage( $img, false );
$img_lazy .= $this->noscript( $img[0] );
- $safe_img = str_replace('/', '\/', preg_quote( $img[0], '#' ));
- $html = preg_replace( '#<noscript[^>]*>.*' . $safe_img . '.*<\/noscript>(*SKIP)(*FAIL)|' . $safe_img . '#iU', $img_lazy, $html );
+ $safe_img = str_replace( '/', '\/', preg_quote( $img[0], '#' ) );
+ $html = preg_replace( '#<noscript[^>]*>.*' . $safe_img . '.*<\/noscript>(*SKIP)(*FAIL)|' . $safe_img . '#i', $img_lazy, $html );
unset( $img_lazy );
}
@@ -321,13 +358,6 @@ private function canLazyload( $image ) {
return false;
}
- // Don't apply LazyLoad on images from WP Retina x2.
- if ( function_exists( 'wr2x_picture_rewrite' ) ) {
- if ( wr2x_get_retina( trailingslashit( ABSPATH ) . wr2x_get_pathinfo_from_image_src( trim( $image['src'], '"' ) ) ) ) {
- return false;
- }
- }
-
return $image;
}
@@ -340,7 +370,7 @@ private function canLazyload( $image ) {
*/
public function isExcluded( $string, $excluded_values ) {
if ( ! is_array( $excluded_values ) ) {
- (array) $excluded_values;
+ $excluded_values = (array) $excluded_values;
}
if ( empty( $excluded_values ) ) {
@@ -366,7 +396,6 @@ public function getExcludedAttributes() {
* Filters the attributes used to prevent lazylad from being applied
*
* @since 1.0
- * @author Remy Perona
*
* @param array $excluded_attributes An array of excluded attributes.
*/
@@ -394,6 +423,7 @@ public function getExcludedAttributes() {
'avia-bg-style-fixed',
'data-skip-lazy',
'skip-lazy',
+ 'image-compare__',
]
);
}
@@ -408,7 +438,6 @@ public function getExcludedSrc() {
* Filters the src used to prevent lazylad from being applied
*
* @since 1.0
- * @author Remy Perona
*
* @param array $excluded_src An array of excluded src.
*/
@@ -426,26 +455,43 @@ public function getExcludedSrc() {
* Replaces the original image by the lazyload one
*
* @param array $image Array of matches elements.
+ * @param bool $use_native Use native lazyload.
+ *
* @return string
*/
- private function replaceImage( $image ) {
- $width = 0;
- $height = 0;
-
- if ( preg_match( '@[\s"\']width\s*=\s*(\'|")(?<width>.*)\1@iUs', $image['atts'], $atts ) ) {
- $width = absint( $atts['width'] );
- }
-
- if ( preg_match( '@[\s"\']height\s*=\s*(\'|")(?<height>.*)\1@iUs', $image['atts'], $atts ) ) {
- $height = absint( $atts['height'] );
+ private function replaceImage( $image, $use_native = true ) {
+ if ( empty( $image ) ) {
+ return '';
}
- $placeholder_atts = preg_replace( '@\ssrc\s*=\s*(\'|")(?<src>.*)\1@iUs', ' src="' . $this->getPlaceholder( $width, $height ) . '"', $image['atts'] );
+ $native_pattern = '@\sloading\s*=\s*(\'|")(?:lazy|auto)\1@i';
+ $image_lazyload = $image[0];
- $image_lazyload = str_replace( $image['atts'], $placeholder_atts . ' data-lazy-src="' . $image['src'] . '"', $image[0] );
+ if ( $use_native ) {
+ if ( preg_match( $native_pattern, $image[0] ) ) {
+ return $image[0];
+ }
- if ( ! preg_match( '@\sloading\s*=\s*(\'|")(?:lazy|auto)\1@i', $image_lazyload ) && apply_filters( 'rocket_use_native_lazyload', false ) ) {
$image_lazyload = str_replace( '<img', '<img loading="lazy"', $image_lazyload );
+ } else {
+ $width = 0;
+ $height = 0;
+
+ if ( preg_match( '@[\s"\']width\s*=\s*(\'|")(?<width>.*)\1@iUs', $image['atts'], $atts ) ) {
+ $width = absint( $atts['width'] );
+ }
+
+ if ( preg_match( '@[\s"\']height\s*=\s*(\'|")(?<height>.*)\1@iUs', $image['atts'], $atts ) ) {
+ $height = absint( $atts['height'] );
+ }
+
+ $placeholder_atts = preg_replace( '@\ssrc\s*=\s*(\'|")(?<src>.*)\1@iUs', ' src="' . $this->getPlaceholder( $width, $height ) . '"', $image['atts'] );
+
+ $image_lazyload = str_replace( $image['atts'], $placeholder_atts . ' data-lazy-src="' . $image['src'] . '"', $image_lazyload );
+
+ if ( preg_match( $native_pattern, $image_lazyload ) ) {
+ $image_lazyload = preg_replace( $native_pattern, '', $image_lazyload );
+ }
}
/**
@@ -492,6 +538,10 @@ public function lazyloadResponsiveAttributes( $html ) {
public function convertSmilies( $text ) {
global $wp_smiliessearch;
+ if ( empty( $text ) || ! is_string( $text ) ) {
+ return $text;
+ }
+
if ( ! get_option( 'use_smilies' ) || empty( $wp_smiliessearch ) ) {
return $text;
}
@@ -563,7 +613,7 @@ private function translateSmiley( $matches ) {
* @param string $img Filename for the smiley image.
* @param string $site_url Site URL, as returned by site_url().
*/
- $src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
+ $src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
// Don't LazyLoad if process is stopped for these reasons.
if ( is_feed() || is_preview() ) {
@@ -577,7 +627,6 @@ private function translateSmiley( $matches ) {
* Returns the placeholder for the src attribute
*
* @since 1.2
- * @author Remy Perona
*
* @param int $width Width of the placeholder image. Default 0.
* @param int $height Height of the placeholder image. Default 0.
diff --git a/src/EventManagement/EventManager.php b/src/EventManagement/EventManager.php
deleted file mode 100644
index 3b696bd..0000000
--- a/src/EventManagement/EventManager.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/**
- * Event Manager to interact with the WP plugin API
- *
- * @package RocketLazyload
- */
-
-namespace RocketLazyLoadPlugin\EventManagement;
-
-defined('ABSPATH') || die('Cheatin\' uh?');
-
-/**
- * The event manager manages events using the WordPress plugin API.
- *
- * @since 3.1
- * @author Carl Alexander <contact@carlalexander.ca>
- */
-class EventManager
-{
- /**
- * Adds a callback to a specific hook of the WordPress plugin API.
- *
- * @uses add_filter()
- *
- * @param string $hook_name Name of the hook.
- * @param callable $callback Callback function.
- * @param int $priority Priority.
- * @param int $accepted_args Number of arguments.
- */
- public function addCallback($hook_name, $callback, $priority = 10, $accepted_args = 1)
- {
- add_filter($hook_name, $callback, $priority, $accepted_args);
- }
-
- /**
- * Add an event subscriber.
- *
- * The event manager registers all the hooks that the given subscriber
- * wants to register with the WordPress Plugin API.
- *
- * @param SubscriberInterface $subscriber SubscriberInterface implementation.
- */
- public function addSubscriber(SubscriberInterface $subscriber)
- {
- if ($subscriber instanceof EventManagerAwareSubscriberInterface) {
- $subscriber->setEventManager($this);
- }
-
- foreach ($subscriber->getSubscribedEvents() as $hook_name => $parameters) {
- $this->addSubscriberCallback($subscriber, $hook_name, $parameters);
- }
- }
-
- /**
- * Checks the WordPress plugin API to see if the given hook has
- * the given callback. The priority of the callback will be returned
- * or false. If no callback is given will return true or false if
- * there's any callbacks registered to the hook.
- *
- * @uses has_filter()
- *
- * @param string $hook_name Hook name.
- * @param mixed $callback Callback.
- *
- * @return bool|int
- */
- public function hasCallback($hook_name, $callback = false)
- {
- return has_filter($hook_name, $callback);
- }
-
- /**
- * Removes the given callback from the given hook. The WordPress plugin API only
- * removes the hook if the callback and priority match a registered hook.
- *
- * @uses remove_filter()
- *
- * @param string $hook_name Hook name.
- * @param callable $callback Callback.
- * @param int $priority Priority.
- *
- * @return bool
- */
- public function removeCallback($hook_name, $callback, $priority = 10)
- {
- return remove_filter($hook_name, $callback, $priority);
- }
-
- /**
- * Remove an event subscriber.
- *
- * The event manager removes all the hooks that the given subscriber
- * wants to register with the WordPress Plugin API.
- *
- * @param SubscriberInterface $subscriber SubscriberInterface implementation.
- */
- public function removeSubscriber(SubscriberInterface $subscriber)
- {
- foreach ($subscriber->getSubscribedEvents() as $hook_name => $parameters) {
- $this->removeSubscriberCallback($subscriber, $hook_name, $parameters);
- }
- }
-
- /**
- * Adds the given subscriber's callback to a specific hook
- * of the WordPress plugin API.
- *
- * @param SubscriberInterface $subscriber SubscriberInterface implementation.
- * @param string $hook_name Hook name.
- * @param mixed $parameters Parameters, can be a string, an array or a multidimensional array.
- */
- private function addSubscriberCallback(SubscriberInterface $subscriber, $hook_name, $parameters)
- {
- if (is_string($parameters)) {
- $this->addCallback($hook_name, [ $subscriber, $parameters ]);
- } elseif (is_array($parameters) && count($parameters) !== count($parameters, COUNT_RECURSIVE)) {
- foreach ($parameters as $parameter) {
- $this->addSubscriberCallback($subscriber, $hook_name, $parameter);
- }
- } elseif (is_array($parameters) && isset($parameters[0])) {
- $this->addCallback($hook_name, [ $subscriber, $parameters[0] ], isset($parameters[1]) ? $parameters[1] : 10, isset($parameters[2]) ? $parameters[2] : 1);
- }
- }
-
- /**
- * Removes the given subscriber's callback to a specific hook
- * of the WordPress plugin API.
- *
- * @param SubscriberInterface $subscriber SubscriberInterface implementation.
- * @param string $hook_name Hook name.
- * @param mixed $parameters Parameters, can be a string, an array or a multidimensional array.
- */
- private function removeSubscriberCallback(SubscriberInterface $subscriber, $hook_name, $parameters)
- {
- if (is_string($parameters)) {
- $this->removeCallback($hook_name, [ $subscriber, $parameters ]);
- } elseif (is_array($parameters) && count($parameters) !== count($parameters, COUNT_RECURSIVE)) {
- foreach ($parameters as $parameter) {
- $this->removeSubscriberCallback($subscriber, $hook_name, $parameter);
- }
- } elseif (is_array($parameters) && isset($parameters[0])) {
- $this->removeCallback($hook_name, [ $subscriber, $parameters[0] ], isset($parameters[1]) ? $parameters[1] : 10);
- }
- }
-}
diff --git a/src/EventManagement/EventManagerAwareSubscriberInterface.php b/src/EventManagement/EventManagerAwareSubscriberInterface.php
deleted file mode 100644
index 2b5b2a1..0000000
--- a/src/EventManagement/EventManagerAwareSubscriberInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Interface for subscribers who need access to the event manager object
- *
- * @package RocketLazyload
- */
-
-namespace RocketLazyLoadPlugin\EventManagement;
-
-interface EventManagerAwareSubscriberInterface extends SubscriberInterface
-{
- /**
- * Set the WordPress event manager for the subscriber.
- *
- * @since 3.1
- * @author Remy Perona
- *
- * @param EventManager $event_manager EventManager instance.
- */
- public function setEventManager(EventManager $event_manager);
-}
diff --git a/src/EventManagement/SubscriberInterface.php b/src/EventManagement/SubscriberInterface.php
deleted file mode 100644
index 0612c77..0000000
--- a/src/EventManagement/SubscriberInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Interface for subscribers
- *
- * @package RocketLazyload
- */
-
-namespace RocketLazyLoadPlugin\EventManagement;
-
-/**
- * A Subscriber knows what specific WordPress events it wants to listen to.
- *
- * When an EventManager adds a Subscriber, it gets all the WordPress events that
- * it wants to listen to. It then adds the subscriber as a listener for each of them.
- *
- * @author Carl Alexander <contact@carlalexander.ca>
- */
-interface SubscriberInterface
-{
- /**
- * Returns an array of events that this subscriber wants to listen to.
- *
- * The array key is the event name. The value can be:
- *
- * * The method name
- * * An array with the method name and priority
- * * An array with the method name, priority and number of accepted arguments
- *
- * For instance:
- *
- * * array('hook_name' => 'method_name')
- * * array('hook_name' => array('method_name', $priority))
- * * array('hook_name' => array('method_name', $priority, $accepted_args))
- * * array('hook_name' => array(array('method_name_1', $priority_1, $accepted_args_1)), array('method_name_2', $priority_2, $accepted_args_2)))
- *
- * @return array
- */
- public function getSubscribedEvents();
-}
diff --git a/src/Options/AbstractOptions.php b/src/Options/AbstractOptions.php
deleted file mode 100644
index 8cdf555..0000000
--- a/src/Options/AbstractOptions.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Abstract class to interact with the WP options API
- *
- * @package RocketLazyloadPlugin
- */
-
-namespace RocketLazyLoadPlugin\Options;
-
-/**
- * Manages options using the WordPress options API.
- *
- * @since 2.0
- * @author Remy Perona
- */
-abstract class AbstractOptions
-{
- /**
- * Gets the option for the given name. Returns the default value if the value does not exist.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $name Name of the option to get.
- * @param mixed $default Default value to return if the value does not exist.
- *
- * @return mixed
- */
- abstract public function get($name, $default = null);
-
- /**
- * Sets the value of an option. Update the value if the option for the given name already exists.
- *
- * @since 2.0
- * @author Remy Perona
- * @param string $name Name of the option to set.
- * @param mixed $value Value to set for the option.
- *
- * @return void
- */
- abstract public function set($name, $value);
-
- /**
- * Deletes the option with the given name.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $name Name of the option to delete.
- *
- * @return void
- */
- abstract public function delete($name);
-
- /**
- * Checks if the option with the given name exists.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $name Name of the option to check.
- *
- * @return boolean True if the option exists, false otherwise
- */
- public function has($name)
- {
- return null !== $this->get($name);
- }
-}
diff --git a/src/Options/OptionArray.php b/src/Options/OptionArray.php
deleted file mode 100644
index 6b647a4..0000000
--- a/src/Options/OptionArray.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Manages the plugin options data
- *
- * @package RocketLazyloadPlugin
- */
-
-namespace RocketLazyLoadPlugin\Options;
-
-/**
- * Manages the data inside an option.
- *
- * @since 2.0
- * @author Remy Perona
- */
-class OptionArray
-{
- /**
- * Option data
- *
- * @var Array Array of data inside the option
- */
- private $options;
-
- /**
- * Constructor
- *
- * @param Array $options Array of data coming from an option.
- */
- public function __construct($options)
- {
- $this->options = $options;
- }
-
- /**
- * Checks if the provided key exists in the option data array.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $key key name.
- * @return boolean
- */
- public function has($key)
- {
- return isset($this->options[ $key ]);
- }
-
- /**
- * Gets the value associated with a specific key.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $key key name.
- * @param mixed $default default value to return if key doesn't exist.
- * @return mixed
- */
- public function get($key, $default = '')
- {
- if (! $this->has($key)) {
- return $default;
- }
-
- return $this->options[ $key ];
- }
-
- /**
- * Sets the value associated with a specific key.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $key key name.
- * @param mixed $value Value to set.
- * @return void
- */
- public function set($key, $value)
- {
- $this->options[ $key ] = $value;
- }
-
- /**
- * Sets multiple values.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param array $options An array of key/value pairs to set.
- * @return void
- */
- public function setValues($options)
- {
- foreach ($options as $key => $value) {
- $this->set($key, $value);
- }
- }
-
- /**
- * Gets the option array.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return array
- */
- public function getOptions()
- {
- return $this->options;
- }
-}
diff --git a/src/Options/Options.php b/src/Options/Options.php
deleted file mode 100644
index b942643..0000000
--- a/src/Options/Options.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Options Class
- *
- * @package RocketLazyloadPlugin
- */
-
-namespace RocketLazyLoadPlugin\Options;
-
-defined('ABSPATH') || die('Cheatin\' uh?');
-
-/**
- * Interact with the WordPress Options API
- */
-class Options extends AbstractOptions
-{
- /**
- * The prefix used by Rocket Lazyload options.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @var string
- */
- private $prefix;
-
- /**
- * Constructor
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $prefix options prefix.
- */
- public function __construct($prefix = '')
- {
- $this->prefix = $prefix;
- }
-
- /**
- * Gets the option name used to store the option in the WordPress database.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $name Unprefixed name of the option.
- *
- * @return string
- */
- public function getOptionName($name)
- {
- return $this->prefix . $name;
- }
-
- /**
- * Gets the option for the given name. Returns the default value if the value does not exist.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $name Name of the option to get.
- * @param mixed $default Default value to return if the value does not exist.
- *
- * @return mixed
- */
- public function get($name, $default = null)
- {
- $option = get_option($this->getOptionName($name), $default);
-
- if (is_array($default) && ! is_array($option)) {
- $option = (array) $option;
- }
-
- return $option;
- }
-
- /**
- * Sets the value of an option. Update the value if the option for the given name already exists.
- *
- * @since 2.0
- * @author Remy Perona
- * @param string $name Name of the option to set.
- * @param mixed $value Value to set for the option.
- *
- * @return void
- */
- public function set($name, $value)
- {
- update_option($this->getOptionName($name), $value);
- }
-
- /**
- * Deletes the option with the given name.
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param string $name Name of the option to delete.
- *
- * @return void
- */
- public function delete($name)
- {
- delete_option($this->getOptionName($name));
- }
-}
diff --git a/src/Plugin.php b/src/Plugin.php
deleted file mode 100644
index 49bba68..0000000
--- a/src/Plugin.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace RocketLazyLoadPlugin;
-
-use RocketLazyLoadPlugin\Dependencies\League\Container\Container;
-use RocketLazyLoadPlugin\EventManagement\EventManager;
-use RocketLazyLoadPlugin\Options\Options;
-
-/**
- * Plugin initialize
- *
- * @since 2.0
- * @author Remy Perona
- */
-class Plugin {
-
- /**
- * Is the plugin loaded
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @var boolean
- */
- private $loaded = false;
-
- /**
- * Checks if the plugin is loaded
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return boolean
- */
- private function isLoaded() {
- return $this->loaded;
- }
-
- /**
- * Loads the plugin in WordPress
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return void
- */
- public function load() {
- if ( $this->isLoaded() ) {
- return;
- }
-
- $container = new Container();
-
- $container->add( 'template_path', \ROCKET_LL_PATH . 'views/' );
- $container->add( 'plugin_basename', \ROCKET_LL_BASENAME );
-
- $container->add(
- 'options',
- function () {
- return new Options( 'rocket_lazyload' );
- }
- );
-
- $container->add(
- 'event_manager',
- function () {
- return new EventManager();
- }
- );
-
- $service_providers = [
- 'RocketLazyLoadPlugin\ServiceProvider\OptionServiceProvider',
- 'RocketLazyLoadPlugin\ServiceProvider\AdminServiceProvider',
- 'RocketLazyLoadPlugin\ServiceProvider\ImagifyNoticeServiceProvider',
- 'RocketLazyLoadPlugin\ServiceProvider\LazyloadServiceProvider',
- 'RocketLazyLoadPlugin\ServiceProvider\SubscribersServiceProvider',
- ];
-
- foreach ( $service_providers as $service ) {
- $container->addServiceProvider( $service );
- }
-
- $subscribers = [
- 'RocketLazyLoadPlugin\Subscriber\ThirdParty\AMPSubscriber',
- 'RocketLazyLoadPlugin\Subscriber\AdminPageSubscriber',
- 'RocketLazyLoadPlugin\Subscriber\ImagifyNoticeSubscriber',
- 'RocketLazyLoadPlugin\Subscriber\LazyloadSubscriber',
- ];
-
- foreach ( $subscribers as $subscriber ) {
- $container->get( 'event_manager' )->addSubscriber( $container->get( $subscriber ) );
- }
-
- $this->loaded = true;
- }
-}
diff --git a/src/ServiceProvider/AdminServiceProvider.php b/src/ServiceProvider/AdminServiceProvider.php
index caa9842..7f8a4c8 100644
--- a/src/ServiceProvider/AdminServiceProvider.php
+++ b/src/ServiceProvider/AdminServiceProvider.php
@@ -7,7 +7,10 @@
namespace RocketLazyLoadPlugin\ServiceProvider;
-use RocketLazyLoadPlugin\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
+use RocketLazyLoadPlugin\Admin\AdminPage;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadCore\Container\AbstractServiceProvider;
+use RocketLazyLoadPlugin\Dependencies\League\Container\Definition\DefinitionInterface;
+use RocketLazyLoadPlugin\Subscriber\AdminPageSubscriber;
/**
* Adds the admin page to the container
@@ -15,33 +18,30 @@
* @since 2.0
* @author Remy Perona
*/
-class AdminServiceProvider extends AbstractServiceProvider
-{
- /**
- * Data provided by the service provider
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @var array
- */
- protected $provides = [
- 'RocketLazyLoadPlugin\Admin\AdminPage',
- ];
+class AdminServiceProvider extends AbstractServiceProvider {
- /**
- * Registers the admin page in the container
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return void
- */
- public function register()
- {
- $this->getContainer()->add('RocketLazyLoadPlugin\Admin\AdminPage')
- ->withArgument($this->getContainer()->get('options'))
- ->withArgument($this->getContainer()->get('RocketLazyLoadPlugin\Options\OptionArray'))
- ->withArgument($this->getContainer()->get('template_path'));
- }
-}
+ public function get_common_subscribers(): array {
+ return [
+ AdminPageSubscriber::class,
+ ];
+ }
+
+ public function define() {
+ $this->register_service( AdminPage::class )
+ ->set_definition( function ( DefinitionInterface $instance ) {
+ $instance->addArguments( [
+ 'template_path'
+ ] );
+ } );
+
+ $this->register_service( AdminPageSubscriber::class )
+ ->share()
+ ->set_definition( function ( DefinitionInterface $instance ) {
+ $instance->addArguments( [
+ AdminPage::class,
+ 'plugin_basename'
+ ]
+ );
+ } );
+ }
+}
\ No newline at end of file
diff --git a/src/ServiceProvider/ImagifyNoticeServiceProvider.php b/src/ServiceProvider/ImagifyNoticeServiceProvider.php
index 6277ebc..e275c32 100644
--- a/src/ServiceProvider/ImagifyNoticeServiceProvider.php
+++ b/src/ServiceProvider/ImagifyNoticeServiceProvider.php
@@ -7,39 +7,21 @@
namespace RocketLazyLoadPlugin\ServiceProvider;
-use RocketLazyLoadPlugin\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadCore\Container\AbstractServiceProvider;
+use RocketLazyLoadPlugin\Dependencies\League\Container\Definition\DefinitionInterface;
+
/**
* Adds the Imagify notice to the container
- *
- * @since 2.0
- * @author Remy Perona
*/
-class ImagifyNoticeServiceProvider extends AbstractServiceProvider
-{
- /**
- * Data provided by the service provider
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @var array
- */
- protected $provides = [
- 'RocketLazyLoadPlugin\Admin\ImagifyNotice',
- ];
+class ImagifyNoticeServiceProvider extends AbstractServiceProvider {
- /**
- * Registers the Imagify notice in the container
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return void
- */
- public function register()
- {
- $this->getContainer()->add('RocketLazyLoadPlugin\Admin\ImagifyNotice')
- ->withArgument($this->getContainer()->get('template_path'));
- }
+ public function define() {
+ $this->register_service( \RocketLazyLoadPlugin\Admin\ImagifyNotice::class )
+ ->set_definition( function ( DefinitionInterface $instance ) {
+ $instance->addArguments( [
+ 'template_path',
+ ] );
+ } );
+ }
}
diff --git a/src/ServiceProvider/LazyloadServiceProvider.php b/src/ServiceProvider/LazyloadServiceProvider.php
index 6c68f0b..d044a1d 100644
--- a/src/ServiceProvider/LazyloadServiceProvider.php
+++ b/src/ServiceProvider/LazyloadServiceProvider.php
@@ -7,7 +7,7 @@
namespace RocketLazyLoadPlugin\ServiceProvider;
-use RocketLazyLoadPlugin\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadCore\Container\AbstractServiceProvider;
/**
* Adds the lazyload library to the container
@@ -15,34 +15,11 @@
* @since 2.0
* @author Remy Perona
*/
-class LazyloadServiceProvider extends AbstractServiceProvider
-{
- /**
- * Data provided by the service provider
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @var array
- */
- protected $provides = [
- 'RocketLazyLoadPlugin\Dependencies\RocketLazyload\Assets',
- 'RocketLazyLoadPlugin\Dependencies\RocketLazyload\Image',
- 'RocketLazyLoadPlugin\Dependencies\RocketLazyload\Iframe',
- ];
+class LazyloadServiceProvider extends AbstractServiceProvider {
- /**
- * Registers the lazyload library in the container
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return void
- */
- public function register()
- {
- $this->getContainer()->add('RocketLazyLoadPlugin\Dependencies\RocketLazyload\Assets');
- $this->getContainer()->add('RocketLazyLoadPlugin\Dependencies\RocketLazyload\Image');
- $this->getContainer()->add('RocketLazyLoadPlugin\Dependencies\RocketLazyload\Iframe');
- }
+ public function define() {
+ $this->register_service( \RocketLazyLoadPlugin\Dependencies\RocketLazyload\Assets::class );
+ $this->register_service( \RocketLazyLoadPlugin\Dependencies\RocketLazyload\Image::class );
+ $this->register_service( \RocketLazyLoadPlugin\Dependencies\RocketLazyload\Iframe::class );
+ }
}
diff --git a/src/ServiceProvider/OptionServiceProvider.php b/src/ServiceProvider/OptionServiceProvider.php
deleted file mode 100644
index 99953a6..0000000
--- a/src/ServiceProvider/OptionServiceProvider.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Service Provider for the plugin options
- *
- * @package RocketLazyload
- */
-
-namespace RocketLazyLoadPlugin\ServiceProvider;
-
-use RocketLazyLoadPlugin\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
-
-/**
- * Adds the option array to the container
- *
- * @since 2.0
- * @author Remy Perona
- */
-class OptionServiceProvider extends AbstractServiceProvider
-{
- /**
- * Data provided by the service provider
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @var array
- */
- protected $provides = [
- 'RocketLazyLoadPlugin\Options\OptionArray',
- ];
-
- /**
- * Registers the option array in the container
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return void
- */
- public function register()
- {
- $this->getContainer()->add('RocketLazyLoadPlugin\Options\OptionArray')
- ->withArgument($this->getContainer()->get('options')->get('_options'));
- }
-}
diff --git a/src/ServiceProvider/SubscribersServiceProvider.php b/src/ServiceProvider/SubscribersServiceProvider.php
index 6fcc15a..9db7bfa 100644
--- a/src/ServiceProvider/SubscribersServiceProvider.php
+++ b/src/ServiceProvider/SubscribersServiceProvider.php
@@ -7,54 +7,48 @@
namespace RocketLazyLoadPlugin\ServiceProvider;
-use RocketLazyLoadPlugin\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
+use RocketLazyLoadPlugin\Admin\ImagifyNotice;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadCore\Container\AbstractServiceProvider;
+
+use RocketLazyLoadPlugin\Dependencies\League\Container\Definition\DefinitionInterface;
+use RocketLazyLoadPlugin\Dependencies\RocketLazyload\Assets;
+use RocketLazyLoadPlugin\Dependencies\RocketLazyload\Iframe;
+use RocketLazyLoadPlugin\Dependencies\RocketLazyload\Image;
+use RocketLazyLoadPlugin\Subscriber\ImagifyNoticeSubscriber;
+use RocketLazyLoadPlugin\Subscriber\LazyloadSubscriber;
+use RocketLazyLoadPlugin\Subscriber\ThirdParty\AMPSubscriber;
+
+class SubscribersServiceProvider extends AbstractServiceProvider {
+
+ public function get_common_subscribers(): array {
+ return [
+ AMPSubscriber::class,
+ ImagifyNoticeSubscriber::class,
+ LazyloadSubscriber::class
+ ];
+ }
+
+ public function define() {
+ $this->register_service( AMPSubscriber::class )
+ ->share();
+
+ $this->register_service( ImagifyNoticeSubscriber::class )
+ ->share()
+ ->set_definition( function ( DefinitionInterface $instance ) {
+ $instance->addArgument( ImagifyNotice::class );
+ } );
+
+ $this->register_service( LazyloadSubscriber::class )
+ ->share()
+ ->set_definition( function ( DefinitionInterface $instance ) {
+ $instance->addArguments( [
+ Assets::class,
+ Image::class,
+ Iframe::class
+ ]
+ );
+ }
+ );
+ }
-/**
- * Adds the subscribers to the container
- *
- * @since 2.0
- * @author Remy Perona
- */
-class SubscribersServiceProvider extends AbstractServiceProvider
-{
- /**
- * Data provided by the service provider
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @var array
- */
- protected $provides = [
- 'RocketLazyLoadPlugin\Subscriber\ThirdParty\AMPSubscriber',
- 'RocketLazyLoadPlugin\Subscriber\AdminPageSubscriber',
- 'RocketLazyLoadPlugin\Subscriber\ImagifyNoticeSubscriber',
- 'RocketLazyLoadPlugin\Subscriber\LazyloadSubscriber',
- ];
-
- /**
- * Registers the subscribers in the container
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return void
- */
- public function register()
- {
- $this->getContainer()->share('RocketLazyLoadPlugin\Subscriber\ThirdParty\AMPSubscriber');
-
- $this->getContainer()->share('RocketLazyLoadPlugin\Subscriber\AdminPageSubscriber')
- ->withArgument($this->getContainer()->get('RocketLazyLoadPlugin\Admin\AdminPage'))
- ->withArgument($this->getContainer()->get('plugin_basename'));
-
- $this->getContainer()->share('RocketLazyLoadPlugin\Subscriber\ImagifyNoticeSubscriber')
- ->withArgument($this->getContainer()->get('RocketLazyLoadPlugin\Admin\ImagifyNotice'));
-
- $this->getContainer()->share('RocketLazyLoadPlugin\Subscriber\LazyloadSubscriber')
- ->withArgument($this->getContainer()->get('RocketLazyLoadPlugin\Options\OptionArray'))
- ->withArgument($this->getContainer()->get('RocketLazyLoadPlugin\Dependencies\RocketLazyload\Assets'))
- ->withArgument($this->getContainer()->get('RocketLazyLoadPlugin\Dependencies\RocketLazyload\Image'))
- ->withArgument($this->getContainer()->get('RocketLazyLoadPlugin\Dependencies\RocketLazyload\Iframe'));
- }
}
diff --git a/src/Subscriber/AdminPageSubscriber.php b/src/Subscriber/AdminPageSubscriber.php
index 09de84d..6f7da29 100644
--- a/src/Subscriber/AdminPageSubscriber.php
+++ b/src/Subscriber/AdminPageSubscriber.php
@@ -2,7 +2,7 @@
namespace RocketLazyLoadPlugin\Subscriber;
-use RocketLazyLoadPlugin\EventManagement\SubscriberInterface;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadCore\EventManagement\ClassicSubscriberInterface;
use RocketLazyLoadPlugin\Admin\AdminPage;
/**
@@ -11,7 +11,7 @@
* @since 2.0
* @author Remy Perona
*/
-class AdminPageSubscriber implements SubscriberInterface {
+class AdminPageSubscriber implements ClassicSubscriberInterface {
/**
* AdminPage instance
@@ -31,20 +31,21 @@ class AdminPageSubscriber implements SubscriberInterface {
*
* @var string
*/
- private $plugin_basename;
+ private static $plugin_basename;
/**
* Constructor
*
+ * @param AdminPage $page AdminPage instance.
+ * @param string $plugin_basename Plugin basename.
+ *
* @since 2.0
* @author Remy Perona
*
- * @param AdminPage $page AdminPage instance.
- * @param string $plugin_basename Plugin basename.
*/
public function __construct( AdminPage $page, $plugin_basename ) {
$this->page = $page;
- $this->plugin_basename = $plugin_basename;
+ self::$plugin_basename = $plugin_basename;
}
/**
@@ -52,22 +53,22 @@ public function __construct( AdminPage $page, $plugin_basename ) {
*
* @return array
*/
- public function getSubscribedEvents() {
+ public function get_subscribed_events(): array {
return [
- 'admin_init' => 'configure',
- 'admin_menu' => 'addAdminPage',
- "plugin_action_links_{$this->plugin_basename}" => 'addPluginPageLink',
- 'admin_enqueue_scripts' => 'enqueueAdminStyle',
+ 'admin_init' => 'configure',
+ 'admin_menu' => 'addAdminPage',
+ "plugin_action_links_" . self::$plugin_basename => 'addPluginPageLink',
+ 'admin_enqueue_scripts' => 'enqueueAdminStyle',
];
}
/**
* Registers the plugin settings in WordPress
*
- * @since 2.0
+ * @return void
* @author Remy Perona
*
- * @return void
+ * @since 2.0
*/
public function configure() {
$this->page->configure();
@@ -76,10 +77,10 @@ public function configure() {
/**
* Adds the admin page to the settings menu
*
- * @since 2.0
+ * @return void
* @author Remy Perona
*
- * @return void
+ * @since 2.0
*/
public function addAdminPage() {
add_options_page(
@@ -94,11 +95,12 @@ public function addAdminPage() {
/**
* Adds a link to the plugin settings on the plugins page
*
+ * @param array $actions Actions for the plugin.
+ *
+ * @return array
* @since 2.0
* @author Remy Perona
*
- * @param array $actions Actions for the plugin.
- * @return array
*/
public function addPluginPageLink( $actions ) {
array_unshift(
@@ -116,10 +118,11 @@ public function addPluginPageLink( $actions ) {
/**
* Enqueue the css for the option page
*
- * @since 2.0
+ * @param string $hook_suffix Current page hook.
+ *
* @author Remy Perona
*
- * @param string $hook_suffix Current page hook.
+ * @since 2.0
*/
public function enqueueAdminStyle( $hook_suffix ) {
if ( 'settings_page_rocket_lazyload' !== $hook_suffix ) {
diff --git a/src/Subscriber/ImagifyNoticeSubscriber.php b/src/Subscriber/ImagifyNoticeSubscriber.php
index c056b77..8a13f54 100644
--- a/src/Subscriber/ImagifyNoticeSubscriber.php
+++ b/src/Subscriber/ImagifyNoticeSubscriber.php
@@ -7,9 +7,9 @@
namespace RocketLazyLoadPlugin\Subscriber;
-defined('ABSPATH') || die('Cheatin\' uh?');
+defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
-use RocketLazyLoadPlugin\EventManagement\SubscriberInterface;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadCore\EventManagement\ClassicSubscriberInterface;
use RocketLazyLoadPlugin\Admin\ImagifyNotice;
/**
@@ -18,80 +18,76 @@
* @since 2.0
* @author Remy Perona
*/
-class ImagifyNoticeSubscriber implements SubscriberInterface
-{
- /**
- * ImagifyNotice instance
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @var ImagifyNotice
- */
- private $imagify_notice;
-
- /**
- * Constructor
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @param ImagifyNotice $imagify_notice ImagifyNotice instance.
- */
- public function __construct(ImagifyNotice $imagify_notice)
- {
- $this->imagify_notice = $imagify_notice;
- }
-
- /**
- * @inheritDoc
- */
- public function getSubscribedEvents()
- {
- return [
- 'admin_notices' => 'imagifyNotice',
- 'admin_footer-settings_page_rocket_lazyload' => 'dismissNoticeJS',
- 'wp_ajax_rocket_lazyload_ignore' => 'dismissBoxes',
- 'admin_post_rocket_lazyload_ignore' => 'dismissBoxes',
- ];
- }
-
- /**
- * Displays the Imagify notice
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return void
- */
- public function imagifyNotice()
- {
- $current_screen = get_current_screen();
-
- if ('admin_notices' === current_filter() && ( isset($current_screen) && 'settings_page_rocket_lazyload' !== $current_screen->base )) {
- return;
- }
-
- $boxes = get_user_meta(get_current_user_id(), 'rocket_lazyload_boxes', true);
-
- if (defined('IMAGIFY_VERSION') || in_array('rocket_lazyload_imagify_notice', (array) $boxes, true) || 1 === get_option('rocket_lazyload_dismiss_imagify_notice') || ! current_user_can('manage_options')) {
- return;
- }
-
- $this->imagify_notice->displayNotice();
- }
-
- /**
- * Inserts the javascript to dismiss the notice
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return void
- */
- public function dismissNoticeJS()
- {
- echo "<script>
+class ImagifyNoticeSubscriber implements ClassicSubscriberInterface {
+ /**
+ * ImagifyNotice instance
+ *
+ * @since 2.0
+ * @author Remy Perona
+ *
+ * @var ImagifyNotice
+ */
+ private $imagify_notice;
+
+ /**
+ * Constructor
+ *
+ * @param ImagifyNotice $imagify_notice ImagifyNotice instance.
+ *
+ * @author Remy Perona
+ *
+ * @since 2.0
+ */
+ public function __construct( ImagifyNotice $imagify_notice ) {
+ $this->imagify_notice = $imagify_notice;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function get_subscribed_events(): array {
+ return [
+ 'admin_notices' => 'imagifyNotice',
+ 'admin_footer-settings_page_rocket_lazyload' => 'dismissNoticeJS',
+ 'wp_ajax_rocket_lazyload_ignore' => 'dismissBoxes',
+ 'admin_post_rocket_lazyload_ignore' => 'dismissBoxes',
+ ];
+ }
+
+ /**
+ * Displays the Imagify notice
+ *
+ * @return void
+ * @author Remy Perona
+ *
+ * @since 2.0
+ */
+ public function imagifyNotice() {
+ $current_screen = get_current_screen();
+
+ if ( 'admin_notices' === current_filter() && ( isset( $current_screen ) && 'settings_page_rocket_lazyload' !== $current_screen->base ) ) {
+ return;
+ }
+
+ $boxes = get_user_meta( get_current_user_id(), 'rocket_lazyload_boxes', true );
+
+ if ( defined( 'IMAGIFY_VERSION' ) || in_array( 'rocket_lazyload_imagify_notice', (array) $boxes, true ) || 1 === get_option( 'rocket_lazyload_dismiss_imagify_notice' ) || ! current_user_can( 'manage_options' ) ) {
+ return;
+ }
+
+ $this->imagify_notice->displayNotice();
+ }
+
+ /**
+ * Inserts the javascript to dismiss the notice
+ *
+ * @return void
+ * @author Remy Perona
+ *
+ * @since 2.0
+ */
+ public function dismissNoticeJS() {
+ echo "<script>
jQuery( document ).ready( function( $ ){
$( '.rktll-cross' ).on( 'click', function( e ) {
e.preventDefault();
@@ -100,53 +96,52 @@ public function dismissNoticeJS()
});
} );
</script>";
- }
-
- /**
- * Saves the dismiss for the user
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @return void
- */
- public function dismissBoxes()
- {
- if (! isset($_GET['box'], $_GET['action'], $_GET['_wpnonce'])) {
- return;
- }
-
- if (! wp_verify_nonce(sanitize_key($_GET['_wpnonce']), 'rocket_lazyload_ignore_rocket_lazyload_imagify_notice')) {
- if (defined('DOING_AJAX')) {
- wp_send_json(['error' => 1]);
- } else {
- wp_nonce_ays('');
- }
- }
-
- $box = sanitize_key(wp_unslash($_GET['box']));
-
- if ('rocket_lazyload_imagify_notice' === $box) {
- update_option('rocket_lazyload_dismiss_imagify_notice', 0);
- }
-
- $actual = (array) get_user_meta(get_current_user_id(), 'rocket_lazyload_boxes', true);
- $actual = array_merge($actual, [ $box ]);
- $actual = array_filter($actual);
- $actual = array_unique($actual);
-
- update_user_meta(get_current_user_id(), 'rocket_lazyload_boxes', $actual);
- delete_transient($box);
-
- if (empty($GLOBALS['pagenow']) || 'admin-post.php' !== $GLOBALS['pagenow']) {
- return;
- }
-
- if (defined('DOING_AJAX')) {
- wp_send_json(['error' => 0]);
- } else {
- wp_safe_redirect(esc_url_raw(wp_get_referer()));
- die();
- }
- }
+ }
+
+ /**
+ * Saves the dismiss for the user
+ *
+ * @return void
+ * @author Remy Perona
+ *
+ * @since 2.0
+ */
+ public function dismissBoxes() {
+ if ( ! isset( $_GET['box'], $_GET['action'], $_GET['_wpnonce'] ) ) {
+ return;
+ }
+
+ if ( ! wp_verify_nonce( sanitize_key( $_GET['_wpnonce'] ), 'rocket_lazyload_ignore_rocket_lazyload_imagify_notice' ) ) {
+ if ( defined( 'DOING_AJAX' ) ) {
+ wp_send_json( [ 'error' => 1 ] );
+ } else {
+ wp_nonce_ays( '' );
+ }
+ }
+
+ $box = sanitize_key( wp_unslash( $_GET['box'] ) );
+
+ if ( 'rocket_lazyload_imagify_notice' === $box ) {
+ update_option( 'rocket_lazyload_dismiss_imagify_notice', 0 );
+ }
+
+ $actual = (array) get_user_meta( get_current_user_id(), 'rocket_lazyload_boxes', true );
+ $actual = array_merge( $actual, [ $box ] );
+ $actual = array_filter( $actual );
+ $actual = array_unique( $actual );
+
+ update_user_meta( get_current_user_id(), 'rocket_lazyload_boxes', $actual );
+ delete_transient( $box );
+
+ if ( empty( $GLOBALS['pagenow'] ) || 'admin-post.php' !== $GLOBALS['pagenow'] ) {
+ return;
+ }
+
+ if ( defined( 'DOING_AJAX' ) ) {
+ wp_send_json( [ 'error' => 0 ] );
+ } else {
+ wp_safe_redirect( esc_url_raw( wp_get_referer() ) );
+ die();
+ }
+ }
}
diff --git a/src/Subscriber/LazyloadSubscriber.php b/src/Subscriber/LazyloadSubscriber.php
index 145c1af..3549de7 100644
--- a/src/Subscriber/LazyloadSubscriber.php
+++ b/src/Subscriber/LazyloadSubscriber.php
@@ -2,8 +2,9 @@
namespace RocketLazyLoadPlugin\Subscriber;
-use RocketLazyLoadPlugin\EventManagement\SubscriberInterface;
-use RocketLazyLoadPlugin\Options\OptionArray;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadCore\EventManagement\ClassicSubscriberInterface;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadFrameworkOptions\Interfaces\SettingsAwareInterface;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadFrameworkOptions\Traits\SettingsAwareTrait;
use RocketLazyLoadPlugin\Dependencies\RocketLazyload\Assets;
use RocketLazyLoadPlugin\Dependencies\RocketLazyload\Image;
use RocketLazyLoadPlugin\Dependencies\RocketLazyload\Iframe;
@@ -14,17 +15,9 @@
* @since 2.0
* @author Remy Perona
*/
-class LazyloadSubscriber implements SubscriberInterface {
+class LazyloadSubscriber implements ClassicSubscriberInterface, SettingsAwareInterface {
- /**
- * OptionArray instance
- *
- * @since 2.0
- * @author Remy Perona
- *
- * @var OptionArray
- */
- private $option_array;
+ use SettingsAwareTrait;
/**
* Assets instance
@@ -59,19 +52,18 @@ class LazyloadSubscriber implements SubscriberInterface {
/**
* Constructor
*
- * @since 2.0
+ * @param Assets $assets Assets instance.
+ * @param Image $image Image instance.
+ * @param Iframe $iframe Iframe instance.
+ *
* @author Remy Perona
*
- * @param OptionArray $option_array OptionArray instance.
- * @param Assets $assets Assets instance.
- * @param Image $image Image instance.
- * @param Iframe $iframe Iframe instance.
+ * @since 2.0
*/
- public function __construct( OptionArray $option_array, Assets $assets, Image $image, Iframe $iframe ) {
- $this->option_array = $option_array;
- $this->assets = $assets;
- $this->image = $image;
- $this->iframe = $iframe;
+ public function __construct( Assets $assets, Image $image, Iframe $iframe ) {
+ $this->assets = $assets;
+ $this->image = $image;
+ $this->iframe = $iframe;
}
/**
@@ -79,7 +71,7 @@ public function __construct( OptionArray $option_array, Assets $assets, Image $i
*
* @return array
*/
- public function getSubscribedEvents() {
+ public function get_subscribed_events(): array {
return [
'wp_footer' => [
[ 'insertLazyloadScript', \ROCKET_LL_INT_MAX ],
@@ -96,13 +88,13 @@ public function getSubscribedEvents() {
/**
* Inserts the lazyload script in the footer
*
- * @since 2.0
+ * @return void
* @author Remy Perona
*
- * @return void
+ * @since 2.0
*/
public function insertLazyloadScript() {
- if ( ! $this->option_array->get( 'images' ) && ! $this->option_array->get( 'iframes' ) ) {
+ if ( ! $this->settings->get( 'images' ) && ! $this->settings->get( 'iframes' ) ) {
return;
}
@@ -113,10 +105,11 @@ public function insertLazyloadScript() {
/**
* Filters the threshold at which lazyload is triggered
*
- * @since 1.2
+ * @param int $threshold Threshold value.
+ *
* @author Remy Perona
*
- * @param int $threshold Threshold value.
+ * @since 1.2
*/
$threshold = apply_filters( 'rocket_lazyload_threshold', 300 );
@@ -130,33 +123,26 @@ public function insertLazyloadScript() {
'threshold' => $threshold,
];
- /**
- * Filters the use of native lazyload
- *
- * @since 2.3.3
- * @param bool $use_native True to enable native lazyload usage.
- */
- if ( apply_filters( 'rocket_use_native_lazyload', false ) ) { // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals
+ if ( $this->is_native_images() ) {
$inline_args['options'] = [
'use_native' => 'true',
];
}
- if ( $this->option_array->get( 'images' ) || $this->option_array->get( 'iframes' ) ) {
- // This filter is documented in src/Subscriber/LazyloadSubscriber.php.
- if ( apply_filters( 'rocket_use_native_lazyload', false ) ) { // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals
+ if ( $this->settings->get( 'images' ) || $this->settings->get( 'iframes' ) ) {
+ if ( $this->is_native_images() ) {
$inline_args['elements'] = isset( $inline_args['elements'] ) ? $inline_args['elements'] : [];
$inline_args['elements']['loading'] = '[loading=lazy]';
}
}
- if ( $this->option_array->get( 'images' ) ) {
+ if ( $this->settings->get( 'images' ) ) {
$inline_args['elements'] = isset( $inline_args['elements'] ) ? $inline_args['elements'] : [];
$inline_args['elements']['image'] = 'img[data-lazy-src]';
$inline_args['elements']['background_image'] = '.rocket-lazyload';
}
- if ( $this->option_array->get( 'iframes' ) ) {
+ if ( $this->settings->get( 'iframes' ) ) {
$inline_args['elements'] = isset( $inline_args['elements'] ) ? $inline_args['elements'] : [];
$inline_args['elements']['iframe'] = 'iframe[data-lazy-src]';
}
@@ -164,10 +150,11 @@ public function insertLazyloadScript() {
/**
* Filters the arguments array for the lazyload script options
*
- * @since 2.0
+ * @param array $inline_args Arguments used for the lazyload script options.
+ *
* @author Remy Perona
*
- * @param array $inline_args Arguments used for the lazyload script options.
+ * @since 2.0
*/
$inline_args = apply_filters( 'rocket_lazyload_script_args', $inline_args );
@@ -178,13 +165,13 @@ public function insertLazyloadScript() {
/**
* Inserts the Youtube thumbnail script in the footer
*
- * @since 2.0
+ * @return void
* @author Remy Perona
*
- * @return void
+ * @since 2.0
*/
public function insertYoutubeThumbnailScript() {
- if ( ! $this->option_array->get( 'youtube' ) ) {
+ if ( ! $this->settings->get( 'youtube' ) ) {
return;
}
@@ -195,17 +182,18 @@ public function insertYoutubeThumbnailScript() {
/**
* Filters the resolution of the YouTube thumbnail
*
- * @since 1.4.8
+ * @param string $thumbnail_resolution The resolution of the thumbnail. Accepted values: default, mqdefault, sddefault, hqdefault, maxresdefault
+ *
* @author Arun Basil Lal
*
- * @param string $thumbnail_resolution The resolution of the thumbnail. Accepted values: default, mqdefault, sddefault, hqdefault, maxresdefault
+ * @since 1.4.8
*/
$thumbnail_resolution = apply_filters( 'rocket_lazyload_youtube_thumbnail_resolution', 'hqdefault' );
$this->assets->insertYoutubeThumbnailScript(
[
'resolution' => $thumbnail_resolution,
- 'lazy_image' => (bool) $this->option_array->get( 'images' ),
+ 'lazy_image' => (bool) $this->settings->get( 'images' ),
]
);
}
@@ -213,10 +201,10 @@ public function insertYoutubeThumbnailScript() {
/**
* Inserts the no JS CSS compatibility in the header
*
- * @since 2.0.3
+ * @return void
* @author Remy Perona
*
- * @return void
+ * @since 2.0.3
*/
public function insertNoJSStyle() {
if ( ! $this->shouldLazyload() ) {
@@ -229,13 +217,13 @@ public function insertNoJSStyle() {
/**
* Inserts the Youtube thumbnail CSS in the header
*
- * @since 2.0
+ * @return void
* @author Remy Perona
*
- * @return void
+ * @since 2.0
*/
public function insertYoutubeThumbnailStyle() {
- if ( ! $this->option_array->get( 'youtube' ) ) {
+ if ( ! $this->settings->get( 'youtube' ) ) {
return;
}
@@ -254,10 +242,10 @@ public function insertYoutubeThumbnailStyle() {
/**
* Checks if lazyload should be applied
*
- * @since 2.0
+ * @return bool
* @author Remy Perona
*
- * @return bool
+ * @since 2.0
*/
private function shouldLazyload() {
if ( is_admin() || is_feed() || is_preview() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || ( defined( 'DONOTLAZYLOAD' ) && DONOTLAZYLOAD ) ) {
@@ -271,10 +259,11 @@ private function shouldLazyload() {
/**
* Filters the lazyload application
*
- * @since 2.0
+ * @param bool $do_rocket_lazyload True to apply lazyload, false otherwise.
+ *
* @author Remy Perona
*
- * @param bool $do_rocket_lazyload True to apply lazyload, false otherwise.
+ * @since 2.0
*/
if ( ! apply_filters( 'do_rocket_lazyload', true ) ) { // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals
return false;
@@ -286,10 +275,10 @@ private function shouldLazyload() {
/**
* Checks if current page is a page builder editor.
*
- * @since 2.2.2
+ * @return bool
* @author Remy Perona
*
- * @return bool
+ * @since 2.2.2
*/
private function isPageBuilder() {
// Exclude Page Builders editors.
@@ -311,10 +300,10 @@ private function isPageBuilder() {
/**
* Gets the content to lazyload
*
- * @since 2.0
+ * @return void
* @author Remy Perona
*
- * @return void
+ * @since 2.0
*/
public function lazyload() {
if ( ! $this->shouldLazyload() ) {
@@ -327,25 +316,26 @@ public function lazyload() {
/**
* Applies lazyload on the provided content
*
+ * @param string $html HTML content.
+ *
+ * @return string
* @since 2.0
* @author Remy Perona
*
- * @param string $html HTML content.
- * @return string
*/
public function lazyloadBuffer( $html ) {
$buffer = $this->ignoreScripts( $html );
$buffer = $this->ignoreNoscripts( $buffer );
- if ( $this->option_array->get( 'images' ) ) {
- $html = $this->image->lazyloadImages( $html, $buffer );
+ if ( $this->settings->get( 'images' ) ) {
+ $html = $this->image->lazyloadImages( $html, $buffer , $this->is_native_images() );
$html = $this->image->lazyloadPictures( $html, $buffer );
$html = $this->image->lazyloadBackgroundImages( $html, $buffer );
}
- if ( $this->option_array->get( 'iframes' ) ) {
+ if ( $this->settings->get( 'iframes' ) ) {
$args = [
- 'youtube' => $this->option_array->get( 'youtube' ),
+ 'youtube' => $this->settings->get( 'youtube' ),
];
$html = $this->iframe->lazyloadIframes( $html, $buffer, $args );
@@ -357,11 +347,12 @@ public function lazyloadBuffer( $html ) {
/**
* Applies lazyload on responsive images attributes srcset and sizes
*
+ * @param string $html Image HTML.
+ *
+ * @return string
* @since 2.0
* @author Remy Perona
*
- * @param string $html Image HTML.
- * @return string
*/
public function lazyloadResponsive( $html ) {
return $this->image->lazyloadResponsiveAttributes( $html );
@@ -370,17 +361,17 @@ public function lazyloadResponsive( $html ) {
/**
* Applies lazyload on WordPress smilies
*
- * @since 2.0
+ * @return void
* @author Remy Perona
*
- * @return void
+ * @since 2.0
*/
public function lazyloadSmilies() {
if ( ! $this->shouldLazyload() ) {
return;
}
- if ( ! $this->option_array->get( 'images' ) ) {
+ if ( ! $this->settings->get( 'images' ) ) {
return;
}
@@ -404,6 +395,7 @@ public function lazyloadSmilies() {
* Remove inline scripts from the HTML to parse
*
* @param string $html HTML content.
+ *
* @return string
*/
private function ignoreScripts( $html ) {
@@ -414,9 +406,24 @@ private function ignoreScripts( $html ) {
* Remove noscript tags from the HTML to parse
*
* @param string $html HTML content.
+ *
* @return string
*/
private function ignoreNoscripts( $html ) {
return preg_replace( '#<noscript>(?:.+)</noscript>#Umsi', '', $html );
}
+
+ /**
+ * Checks if native lazyload is enabled for images
+ **
+ * @return bool
+ */
+ private function is_native_images(): bool {
+ /**
+ * Filters the use of native lazyload for images
+ *
+ * @param bool $use_native True to use native lazyload for images, false otherwise.
+ */
+ return (bool) apply_filters( 'rocket_use_native_lazyload', false );
+ }
}
diff --git a/src/Subscriber/ThirdParty/AMPSubscriber.php b/src/Subscriber/ThirdParty/AMPSubscriber.php
index 04016df..0cdf6bc 100644
--- a/src/Subscriber/ThirdParty/AMPSubscriber.php
+++ b/src/Subscriber/ThirdParty/AMPSubscriber.php
@@ -2,8 +2,8 @@
namespace RocketLazyLoadPlugin\Subscriber\ThirdParty;
-use RocketLazyLoadPlugin\EventManagement\EventManager;
-use RocketLazyLoadPlugin\EventManagement\EventManagerAwareSubscriberInterface;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadCore\EventManagement\EventManagerAwareSubscriberInterface;
+use RocketLazyLoadPlugin\Dependencies\LaunchpadCore\EventManagement\EventManager;
/**
* Manages compatibility with the AMP plugin
@@ -25,7 +25,7 @@ class AMPSubscriber implements EventManagerAwareSubscriberInterface {
*
* @return array
*/
- public function getSubscribedEvents() {
+ public function get_subscribed_events() {
return [
'wp' => 'disableIfAMP',
];
@@ -35,34 +35,35 @@ public function getSubscribedEvents() {
* Set the WordPress event manager for the subscriber.
*
* @param EventManager $event_manager EventManager instance.
+ *
* @return void
*/
- public function setEventManager( EventManager $event_manager ) {
+ public function set_event_manager( EventManager $event_manager ) {
$this->event_manager = $event_manager;
}
/**
* Disable if on AMP page
*
- * @since 2.0.2
+ * @return void
* @author Remy Perona
*
- * @return void
+ * @since 2.0.2
*/
public function disableIfAMP() {
if ( $this->isAmpEndpoint() ) {
- $this->event_manager->addCallback( 'do_rocket_lazyload', '__return_false' );
- $this->event_manager->addCallback( 'do_rocket_lazyload_iframes', '__return_false' );
+ $this->event_manager->add_callback( 'do_rocket_lazyload', '__return_false' );
+ $this->event_manager->add_callback( 'do_rocket_lazyload_iframes', '__return_false' );
}
}
/**
* Checks if current page uses AMP
*
- * @since 2.0
+ * @return boolean
* @author Remy Perona
*
- * @return boolean
+ * @since 2.0
*/
private function isAmpEndpoint() {
if ( function_exists( 'is_amp_endpoint' ) && is_amp_endpoint() ) {
diff --git a/tests/Integration/bootstrap.php b/tests/Integration/bootstrap.php
index a1f8175..4e45159 100644
--- a/tests/Integration/bootstrap.php
+++ b/tests/Integration/bootstrap.php
@@ -5,8 +5,8 @@
* @package RocketlazyloadPlugin\Tests\Integration
*/
-if (version_compare(phpversion(), '5.6.0', '<')) {
- die('Rocket Lazyload Plugin Integration Tests require PHP 5.6 or higher.');
+if (version_compare(phpversion(), '7.3.0', '<')) {
+ die('Rocket Lazyload Plugin Integration Tests require PHP 7.3 or higher.');
}
// Define testing constants.
diff --git a/tests/Unit/boostrap.php b/tests/Unit/bootstrap.php
similarity index 83%
rename from tests/Unit/boostrap.php
rename to tests/Unit/bootstrap.php
index 742a274..b4004df 100644
--- a/tests/Unit/boostrap.php
+++ b/tests/Unit/bootstrap.php
@@ -5,8 +5,8 @@
* @package RocketLazyload\Tests\Unit
*/
-if (version_compare(phpversion(), '5.6.0', '<')) {
- die('Rocket Lazyload Plugin Unit Tests require PHP 5.6 or higher.');
+if (version_compare(phpversion(), '7.3.0', '<')) {
+ die('Rocket Lazyload Plugin Unit Tests require PHP 7.3 or higher.');
}
define('RLL_PLUGIN_TESTS_ROOT', __DIR__);
diff --git a/views/admin-page.php b/views/admin-page.php
index d1a1a66..6dc7f3a 100644
--- a/views/admin-page.php
+++ b/views/admin-page.php
@@ -12,12 +12,15 @@
$options = [
'images' => [
'label' => __('Images', 'rocket-lazy-load'),
+ 'value' => $this->settings->get('images'),
],
'iframes' => [
'label' => __('Iframes & Videos', 'rocket-lazy-load'),
+ 'value' => $this->settings->get('iframes'),
],
'youtube' => [
'label' => __('Replace Youtube videos by thumbnail', 'rocket-lazy-load'),
+ 'value' => $this->settings->get('youtube'),
],
];
@@ -48,9 +51,10 @@
<p><?php esc_html_e('LazyLoad displays images, iframes and videos on a page only when they are visible to the user.', 'rocket-lazy-load'); ?></p>
<p><?php esc_html_e('This mechanism reduces the number of HTTP requests and improves the loading time.', 'rocket-lazy-load'); ?></p>
<ul class="rocket-lazyload-options">
- <?php foreach ($options as $slug => $infos) : ?>
+ <?php
+ foreach ($options as $slug => $infos) : ?>
<li class="rocket-lazyload-option">
- <input type="checkbox" value="1" id="lazyload-<?php echo esc_attr($slug); ?>" name="rocket_lazyload_options[<?php echo esc_attr($slug); ?>]" <?php checked($this->option_array->get($slug, 0), 1); ?> aria-labelledby="describe-lazyload-<?php echo esc_attr($slug); ?>">
+ <input type="checkbox" value="1" id="lazyload-<?php echo esc_attr($slug); ?>" name="rocket_lazyload_options[<?php echo esc_attr($slug); ?>]" <?php checked($infos['value'] ?? 0, 1); ?> aria-labelledby="describe-lazyload-<?php echo esc_attr($slug); ?>">
<label for="lazyload-<?php echo esc_attr($slug); ?>">
<span id="describe-lazyload-<?php echo esc_attr($slug); ?>" class="rocket-lazyload-label-description"><?php echo esc_html($infos['label']); ?></span>
</label>
