Merge pull request #3 from burovoordeboeg/develop

Develop

distributor-meta-data.php

@@ -3,13 +3,13 @@
  * Plugin Name: Distributor Meta Data
  * Plugin URI: https://github.com/burovoordeboeg/distributor-meta-data
  * Description: Push and replace related post_id's in meta data and Gutenberg content blocks. 
- * Version: 0.3.2
+ * Version: 0.3.3
  * Author: Buro voor de Boeg
  * Author URI: https://www.burovoordeboeg.nl
  * License: MIT
  * Requires PHP: 7.2
  * Tested up to: 5.7.1
- * Test up to Distributor: 1.6.2
+ * Test up to Distributor: 1.7.1
  */
 
 namespace BvdB\Distributor;

src/InternalConnections/PostContent.php

@@ -6,8 +6,15 @@
 class PostContent {
 
  public function register_hooks() {
- Utilities::add_filter_once( 'dt_pull_post_args', [ $this, 'alter_post_content' ], 4, 10 );
- Utilities::add_filter_once( 'dt_push_post_args', [ $this, 'alter_post_content' ], 4, 10 );
+
+ /**
+ * As of 1.7.0 Distributor slashes the content of an InternalConnection themselfs
+ * See: https://github.com/10up/distributor/pull/890
+ */
+ if( defined( 'DT_VERSION' ) && (float)DT_VERSION <= 1.6 ) {
+ Utilities::add_filter_once( 'dt_pull_post_args', [ $this, 'alter_post_content' ], 4, 10 );
+ Utilities::add_filter_once( 'dt_push_post_args', [ $this, 'alter_post_content' ], 4, 10 );
+ } 
  }
 
  /**

vendor/autoload.php

@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+ echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+ exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitad7d452f45162b0b8807db3a59670b57::getLoader();

vendor/composer/ClassLoader.php

@@ -37,57 +37,130 @@
  *
  * @author Fabien Potencier <[email protected]>
  * @author Jordi Boggiano <[email protected]>
- * @see http:https://www.php-fig.org/psr/psr-0/
- * @see http:https://www.php-fig.org/psr/psr-4/
+ * @see https:https://www.php-fig.org/psr/psr-0/
+ * @see https:https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
+ /** @var ?string */
+ private $vendorDir;
+
  // PSR-4
+ /**
+ * @var array[]
+ * @psalm-var array<string, array<string, int>>
+ */
  private $prefixLengthsPsr4 = array();
+ /**
+ * @var array[]
+ * @psalm-var array<string, array<int, string>>
+ */
  private $prefixDirsPsr4 = array();
+ /**
+ * @var array[]
+ * @psalm-var array<string, string>
+ */
  private $fallbackDirsPsr4 = array();
 
  // PSR-0
+ /**
+ * @var array[]
+ * @psalm-var array<string, array<string, string[]>>
+ */
  private $prefixesPsr0 = array();
+ /**
+ * @var array[]
+ * @psalm-var array<string, string>
+ */
  private $fallbackDirsPsr0 = array();
 
+ /** @var bool */
  private $useIncludePath = false;
+
+ /**
+ * @var string[]
+ * @psalm-var array<string, string>
+ */
  private $classMap = array();
+
+ /** @var bool */
  private $classMapAuthoritative = false;
+
+ /**
+ * @var bool[]
+ * @psalm-var array<string, bool>
+ */
  private $missingClasses = array();
+
+ /** @var ?string */
  private $apcuPrefix;
 
+ /**
+ * @var self[]
+ */
+ private static $registeredLoaders = array();
+
+ /**
+ * @param ?string $vendorDir
+ */
+ public function __construct($vendorDir = null)
+ {
+ $this->vendorDir = $vendorDir;
+ }
+
+ /**
+ * @return string[]
+ */
  public function getPrefixes()
  {
  if (!empty($this->prefixesPsr0)) {
- return call_user_func_array('array_merge', $this->prefixesPsr0);
+ return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
  }
 
  return array();
  }
 
+ /**
+ * @return array[]
+ * @psalm-return array<string, array<int, string>>
+ */
  public function getPrefixesPsr4()
  {
  return $this->prefixDirsPsr4;
  }
 
+ /**
+ * @return array[]
+ * @psalm-return array<string, string>
+ */
  public function getFallbackDirs()
  {
  return $this->fallbackDirsPsr0;
  }
 
+ /**
+ * @return array[]
+ * @psalm-return array<string, string>
+ */
  public function getFallbackDirsPsr4()
  {
  return $this->fallbackDirsPsr4;
  }
 
+ /**
+ * @return string[] Array of classname => path
+ * @psalm-return array<string, string>
+ */
  public function getClassMap()
  {
  return $this->classMap;
  }
 
  /**
- * @param array $classMap Class to filename map
+ * @param string[] $classMap Class to filename map
+ * @psalm-param array<string, string> $classMap
+ *
+ * @return void
  */
  public function addClassMap(array $classMap)
  {
@@ -102,9 +175,11 @@ public function addClassMap(array $classMap)
  * Registers a set of PSR-0 directories for a given prefix, either
  * appending or prepending to the ones previously set for this prefix.
  *
- * @param string $prefix The prefix
- * @param array|string $paths The PSR-0 root directories
- * @param bool $prepend Whether to prepend the directories
+ * @param string $prefix The prefix
+ * @param string[]|string $paths The PSR-0 root directories
+ * @param bool $prepend Whether to prepend the directories
+ *
+ * @return void
  */
  public function add($prefix, $paths, $prepend = false)
  {
@@ -147,11 +222,13 @@ public function add($prefix, $paths, $prepend = false)
  * Registers a set of PSR-4 directories for a given namespace, either
  * appending or prepending to the ones previously set for this namespace.
  *
- * @param string $prefix The prefix/namespace, with trailing '\\'
- * @param array|string $paths The PSR-4 base directories
- * @param bool $prepend Whether to prepend the directories
+ * @param string  $prefix The prefix/namespace, with trailing '\\'
+ * @param string[]|string $paths The PSR-4 base directories
+ * @param bool  $prepend Whether to prepend the directories
  *
  * @throws \InvalidArgumentException
+ *
+ * @return void
  */
  public function addPsr4($prefix, $paths, $prepend = false)
  {
@@ -195,8 +272,10 @@ public function addPsr4($prefix, $paths, $prepend = false)
  * Registers a set of PSR-0 directories for a given prefix,
  * replacing any others previously set for this prefix.
  *
- * @param string $prefix The prefix
- * @param array|string $paths The PSR-0 base directories
+ * @param string $prefix The prefix
+ * @param string[]|string $paths The PSR-0 base directories
+ *
+ * @return void
  */
  public function set($prefix, $paths)
  {
@@ -211,10 +290,12 @@ public function set($prefix, $paths)
  * Registers a set of PSR-4 directories for a given namespace,
  * replacing any others previously set for this namespace.
  *
- * @param string $prefix The prefix/namespace, with trailing '\\'
- * @param array|string $paths The PSR-4 base directories
+ * @param string  $prefix The prefix/namespace, with trailing '\\'
+ * @param string[]|string $paths The PSR-4 base directories
  *
  * @throws \InvalidArgumentException
+ *
+ * @return void
  */
  public function setPsr4($prefix, $paths)
  {
@@ -234,6 +315,8 @@ public function setPsr4($prefix, $paths)
  * Turns on searching the include path for class files.
  *
  * @param bool $useIncludePath
+ *
+ * @return void
  */
  public function setUseIncludePath($useIncludePath)
  {
@@ -256,6 +339,8 @@ public function getUseIncludePath()
  * that have not been registered with the class map.
  *
  * @param bool $classMapAuthoritative
+ *
+ * @return void
  */
  public function setClassMapAuthoritative($classMapAuthoritative)
  {
@@ -276,6 +361,8 @@ public function isClassMapAuthoritative()
  * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
  *
  * @param string|null $apcuPrefix
+ *
+ * @return void
  */
  public function setApcuPrefix($apcuPrefix)
  {
@@ -296,25 +383,44 @@ public function getApcuPrefix()
  * Registers this instance as an autoloader.
  *
  * @param bool $prepend Whether to prepend the autoloader or not
+ *
+ * @return void
  */
  public function register($prepend = false)
  {
  spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+ if (null === $this->vendorDir) {
+ return;
+ }
+
+ if ($prepend) {
+ self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+ } else {
+ unset(self::$registeredLoaders[$this->vendorDir]);
+ self::$registeredLoaders[$this->vendorDir] = $this;
+ }
  }
 
  /**
  * Unregisters this instance as an autoloader.
+ *
+ * @return void
  */
  public function unregister()
  {
  spl_autoload_unregister(array($this, 'loadClass'));
+
+ if (null !== $this->vendorDir) {
+ unset(self::$registeredLoaders[$this->vendorDir]);
+ }
  }
 
  /**
  * Loads the given class or interface.
  *
  * @param string $class The name of the class
- * @return bool|null True if loaded, null otherwise
+ * @return true|null True if loaded, null otherwise
  */
  public function loadClass($class)
  {
@@ -323,6 +429,8 @@ public function loadClass($class)
 
  return true;
  }
+
+ return null;
  }
 
  /**
@@ -367,6 +475,21 @@ public function findFile($class)
  return $file;
  }
 
+ /**
+ * Returns the currently registered loaders indexed by their corresponding vendor directories.
+ *
+ * @return self[]
+ */
+ public static function getRegisteredLoaders()
+ {
+ return self::$registeredLoaders;
+ }
+
+ /**
+ * @param string $class
+ * @param string $ext
+ * @return string|false
+ */
  private function findFileWithExtension($class, $ext)
  {
  // PSR-4 lookup
@@ -438,6 +561,10 @@ private function findFileWithExtension($class, $ext)
  * Scope isolated include.
  *
  * Prevents access to $this/self from included files.
+ *
+ * @param string $file
+ * @return void
+ * @private
  */
 function includeFile($file)
 {