Skip to content
Snippets Groups Projects
Commit f2e06a5e authored by Paulo Henrique Cota Starling's avatar Paulo Henrique Cota Starling Committed by Thalles Ferreira
Browse files

Issue #3170662 by jungle, paulocs, thalles, hmendes: Fix deprecated code in 9.1.x

parent 622c7ea3
Branches 5.0.x
Tags 5.0.0
1 merge request!11Issue #3196959: Disable "Convert absolute paths to be protocol relative paths." on AMP pages to avoid validation error
name: 'Advanced CSS/JS Aggregation'
description: 'Aggregates multiple CSS/JS files in a way that prevents 404 from happening when accessing a CSS or JS file.'
package: 'Advanced CSS/JS Aggregation'
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9
type: module
configure: advagg.settings
name: 'AdvAgg Bundler'
description: 'Customize the number of aggregates to be created.'
package: 'Advanced CSS/JS Aggregation'
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9
dependencies:
- advagg:advagg
type: module
......
name: 'AdvAgg CDN'
description: 'Use a shared CDN for JavaScript and/or CSS libraries, Google Libraries API currently.'
package: 'Advanced CSS/JS Aggregation'
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9
dependencies:
- advagg:advagg
type: module
......
name: 'AdvAgg Minify CSS'
description: 'Minify CSS.'
package: 'Advanced CSS/JS Aggregation'
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9
dependencies:
- advagg:advagg
type: module
......
name: 'AdvAgg External Minification'
description: 'Minify Javascript and/or CSS with a command line minifier.'
package: 'Advanced CSS/JS Aggregation'
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9
dependencies:
- advagg:advagg
type: module
......
name: 'AdvAgg Minify JavaScript'
description: 'Minify JavaScript with a 3rd party minifier; JSMin+, JSMin c ext, JShrink, and JSqueeze currently.'
package: 'Advanced CSS/JS Aggregation'
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9
dependencies:
- advagg:advagg
type: module
......
name: 'AdvAgg Modifier'
description: 'Allows one to alter the CSS and JS array.'
package: 'Advanced CSS/JS Aggregation'
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9
dependencies:
- advagg:advagg
type: module
......
......@@ -11,7 +11,7 @@ use Drupal\advagg_mod\Asset\TranslateCss;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\Render\HtmlResponse;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\Event\ResponseEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
......@@ -192,15 +192,15 @@ class InitSubscriber implements EventSubscriberInterface {
/**
* Apply CSS defer actions.
*
* @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $response
* @param \Symfony\Component\HttpKernel\Event\ResponseEvent $event
* The response event object.
*/
public function deferCss(FilterResponseEvent $response) {
public function deferCss(ResponseEvent $event) {
// Skip if not enabled.
if (!advagg_mod_css_defer_active()) {
return;
}
$response = $response->getResponse();
$response = $event->getResponse();
// Only process Html Responses.
if (!$response instanceof HtmlResponse) {
......@@ -214,16 +214,16 @@ class InitSubscriber implements EventSubscriberInterface {
/**
* Apply defer JS changes.
*
* @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $response
* @param \Symfony\Component\HttpKernel\Event\ResponseEvent $event
* The response event object.
*/
public function deferJs(FilterResponseEvent $response) {
public function deferJs(ResponseEvent $event) {
// Skip if not enabled.
if (!$this->config->get('js_defer')) {
return;
}
$response = $response->getResponse();
$response = $event->getResponse();
// Only process Html Responses.
if (!$response instanceof HtmlResponse) {
......@@ -237,15 +237,15 @@ class InitSubscriber implements EventSubscriberInterface {
/**
* Apply CSS defer actions.
*
* @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $response
* @param \Symfony\Component\HttpKernel\Event\ResponseEvent $event
* The response event object.
*/
public function asyncJs(FilterResponseEvent $response) {
public function asyncJs(ResponseEvent $event) {
// Skip if not enabled.
if (!$this->config->get('js_async') || $this->config->get('js_defer')) {
return;
}
$response = $response->getResponse();
$response = $event->getResponse();
// Only process Html Responses.
if (!$response instanceof HtmlResponse) {
......
name: 'AdvAgg Old Internet Explorer Compatibility Enhancer'
description: 'Provides some enhanced compatibility with outdated Internet Explorer versions.'
package: 'Advanced CSS/JS Aggregation'
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9
dependencies:
- advagg:advagg
type: module
......
name: 'AdvAgg CSS/JS Validator'
description: 'Validate the CSS and JS files used in Aggregation for syntax errors.'
package: 'Advanced CSS/JS Aggregation'
core_version_requirement: ^8.8 || ^9
core_version_requirement: ^9
type: module
dependencies:
- advagg:advagg
......@@ -2,7 +2,7 @@
namespace Drupal\advagg\Asset;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Contracts\EventDispatcher\Event;
/**
* @defgroup advagg_optimization_event Asset Optimization Event
......
......@@ -4,8 +4,8 @@ namespace Drupal\advagg\EventSubscriber;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Render\HtmlResponse;
use Symfony\Component\HttpKernel\Event\ResponseEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
......@@ -45,10 +45,10 @@ class ResponseSubscriber implements EventSubscriberInterface {
/**
* Passes HtmlResponse responses on to other functions if enabled.
*
* @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
* @param \Symfony\Component\HttpKernel\Event\ResponseEvent $event
* The event to process.
*/
public function processResponse(FilterResponseEvent $event) {
public function processResponse(ResponseEvent $event) {
// Only subscribe to the event if DNS prefetching is enabled.
if ($this->config->get('dns_prefetch')) {
$response = $event->getResponse();
......@@ -74,15 +74,15 @@ class ResponseSubscriber implements EventSubscriberInterface {
/**
* Force absolute paths.
*
* @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $response
* @param \Symfony\Component\HttpKernel\Event\ResponseEvent $event
* The response event object.
*/
public function forceAbsolutePaths(FilterResponseEvent $response) {
public function forceAbsolutePaths(ResponseEvent $event) {
// Skip if not enabled.
if (!$this->config->get('path.convert.absolute')) {
return;
}
$response = $response->getResponse();
$response = $event->getResponse();
// Only process Html Responses.
if (!$response instanceof HtmlResponse) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment