Merge branch 'main' into fix/12332-interdependency

.github/workflows/tests-e2e.yml

@@ -1,5 +1,3 @@
-# Keep in sync with tests-e2e-skip.yml
-
 name: E2E Tests
 
 on:

.github/workflows/tests-karma-dashboard.yml

@@ -1,5 +1,3 @@
-# Keep in sync with tests-karma-dashboard-skip.yml
-
 name: Dashboard Integration Tests
 
 on:

.github/workflows/tests-karma-editor.yml

@@ -1,5 +1,3 @@
-# Keep in sync with tests-karma-editor-skip.yml
-
 name: Editor Integration Tests
 
 on:

.github/workflows/tests-unit-js.yml

@@ -1,5 +1,3 @@
-# Keep in sync with tests-unit-js-skip.yml
-
 name: JavaScript Unit Tests
 
 on:

.github/workflows/tests-unit-php.yml

@@ -1,5 +1,3 @@
-# Keep in sync with tests-unit-php-skip.yml
-
 name: PHP Unit Tests
 
 on:

.phpstorm.meta.php

@@ -39,6 +39,7 @@
 			'media.image_sizes'            => \Google\Web_Stories\Media\Image_Sizes::class,
 			'media.media_source'           => \Google\Web_Stories\Media\Media_Source_Taxonomy::class,
 			'media.video.captions'         => \Google\Web_Stories\Media\Video\Captions::class,
+			'media.cropping'               => \Google\Web_Stories\Media\Cropping::class,
 			'media.video.muting'           => \Google\Web_Stories\Media\Video\Muting::class,
 			'media.video.optimization'     => \Google\Web_Stories\Media\Video\Optimization::class,
 			'media.video.poster'           => \Google\Web_Stories\Media\Video\Poster::class,

composer.json

@@ -31,7 +31,7 @@
     "sirbrillig/phpcs-variable-analysis": "^2.8",
     "slevomat/coding-standard": "^8.0.0",
     "sniccowp/php-scoper-wordpress-excludes": "^6.0",
-    "szepeviktor/phpstan-wordpress": "^v1.1.2",
+    "szepeviktor/phpstan-wordpress": "^v1.1.3",
     "wp-coding-standards/wpcs": "^2.3",
     "yoast/wp-test-utils": "^1.0.0"
   },