Merge branch 'release/4.17.1'

RebelCode · Dec 12, 2019 · abc0cfa · abc0cfa
2 parents 2f7ba7e + 2b139d6
commit abc0cfa
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.17.1] - 2019-12-12
+### Fixed
+* The new slug option was appearing on the edit pages for posts of all types.
+
 ## [4.17] - 2019-12-11
 ### Added
 * New "Tools" that replaces the "Blacklist", "Import/Export" and "Debugging" pages.

diff --git a/src/Entities/Properties/WpPostPermalinkProperty.php b/src/Entities/Properties/WpPostPermalinkProperty.php
@@ -8,12 +8,12 @@
 /**
  * A property for WordPress post permalinks. Read-only.
  *
- * @since [*next-version*]
+ * @since 4.17
  */
 class WpPostPermalinkProperty implements PropertyInterface
 {
     /**
-     * @since [*next-version*]
+     * @since 4.17
      *
      * @var PropertyInterface
      */
@@ -22,7 +22,7 @@ class WpPostPermalinkProperty implements PropertyInterface
     /**
      * Constructor.
      *
-     * @since [*next-version*]
+     * @since 4.17
      *
      * @param PropertyInterface $idProp The property for the WP Post instance or ID.
      */
@@ -34,7 +34,7 @@ public function __construct(PropertyInterface $idProp)
     /**
      * @inheritdoc
      *
-     * @since [*next-version*]
+     * @since 4.17
      */
     public function getValue(EntityInterface $entity)
     {
@@ -44,7 +44,7 @@ public function getValue(EntityInterface $entity)
     /**
      * @inheritdoc
      *
-     * @since [*next-version*]
+     * @since 4.17
      */
     public function setValue(EntityInterface $entity, $value)
     {

diff --git a/src/Entities/Properties/WpraItemSourceProperty.php b/src/Entities/Properties/WpraItemSourceProperty.php
@@ -15,26 +15,26 @@
  * no value for the property, the feed source property is used instead. All set operations will be handled using the
  * feed item property.
  *
- * @since [*next-version*]
+ * @since 4.17
  */
 class WpraItemSourceProperty implements PropertyInterface
 {
     /**
-     * @since [*next-version*]
+     * @since 4.17
      *
      * @var PropertyInterface
      */
     protected $itemProp;
 
     /**
-     * @since [*next-version*]
+     * @since 4.17
      *
      * @var PropertyInterface
      */
     protected $sourceProp;
 
     /**
-     * @since [*next-version*]
+     * @since 4.17
      *
      * @var string
      */
@@ -43,7 +43,7 @@ class WpraItemSourceProperty implements PropertyInterface
     /**
      * Constructor.
      *
-     * @since [*next-version*]
+     * @since 4.17
      *
      * @param PropertyInterface $itemProp    The feed item property.
      * @param PropertyInterface $sourceProp  The feed source property.
@@ -62,7 +62,7 @@ public function __construct(
     /**
      * @inheritdoc
      *
-     * @since [*next-version*]
+     * @since 4.17
      */
     public function getValue(EntityInterface $item)
     {
@@ -85,7 +85,7 @@ public function getValue(EntityInterface $item)
     /**
      * @inheritdoc
      *
-     * @since [*next-version*]
+     * @since 4.17
      */
     public function setValue(EntityInterface $entity, $value)
     {

diff --git a/src/Handlers/RenderMetaBoxTemplateHandler.php b/src/Handlers/RenderMetaBoxTemplateHandler.php
@@ -33,29 +33,45 @@ class RenderMetaBoxTemplateHandler
      */
     protected $entityKey;
 
+    /**
+     * @since 4.17.1
+     *
+     * @var string[]|null
+     */
+    protected $postTypes;
+
     /**
      * Constructor.
      *
-     * @since [*next-version*]
+     * @since 4.17
      *
      * @param TemplateInterface   $template
      * @param CollectionInterface $collection
      * @param string              $entityKey
      */
-    public function __construct(TemplateInterface $template, CollectionInterface $collection, $entityKey = 'entity')
-    {
+    public function __construct(
+        TemplateInterface $template,
+        CollectionInterface $collection,
+        $postTypes = [],
+        $entityKey = 'entity'
+    ) {
         $this->template = $template;
         $this->collection = $collection;
         $this->entityKey = $entityKey;
+        $this->postTypes = $postTypes;
     }
 
     /**
      * @inheritdoc
      *
-     * @since [*next-version*]
+     * @since 4.17
      */
     public function __invoke($post, $args = [])
     {
+        if (!empty($this->postTypes) && !in_array($post->post_type, $this->postTypes)) {
+            return;
+        }
+
         $entity = isset($this->collection[$post->ID])
             ? $this->collection[$post->ID]
             : [];

diff --git a/src/Modules/BlacklistToolModule.php b/src/Modules/BlacklistToolModule.php
@@ -11,22 +11,22 @@
 /**
  * The module that adds the "Blacklist" tool to WP RSS Aggregator.
  *
- * @since [*next-version*]
+ * @since 4.17
  */
 class BlacklistToolModule implements ModuleInterface
 {
     /**
      * @inheritdoc
      *
-     * @since [*next-version*]
+     * @since 4.17
      */
     public function getFactories()
     {
         return [
             /*
              * Information about the "Blacklist" tool.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/blacklist/info' => function (ContainerInterface $c) {
                 return [
@@ -39,7 +39,7 @@ public function getFactories()
             /*
              * The context to add to the "Tools" page.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/blacklist/page/context' => function (ContainerInterface $c) {
                 ob_start();
@@ -55,15 +55,15 @@ public function getFactories()
             /*
              * The list table to show on the "Blacklist" tool page.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/blacklist/page/list_table' => function (ContainerInterface $c) {
                 return new BlacklistTable($c->get('wpra/admin/tools/blacklist/collection'));
             },
             /*
              * The notice to show when a URL is being added to the blacklist with an empty URL.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/blacklist/empty_url_notice' => function () {
                 return sprintf(
@@ -74,7 +74,7 @@ public function getFactories()
             /*
              * The notice to show when a URL has been added to the blacklist.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/blacklist/added_notice' => function () {
                 return sprintf(
@@ -85,7 +85,7 @@ public function getFactories()
             /*
              * The handler that listens to requests for adding URLs to the blacklist.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/blacklist/add_handler' => function (ContainerInterface $c) {
                 return function () use ($c) {
@@ -125,7 +125,7 @@ public function getFactories()
             /*
              * The handler that listens to blacklist deletion requests.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/blacklist/delete_handler' => function (ContainerInterface $c) {
                 return function () use ($c) {
@@ -145,7 +145,7 @@ public function getFactories()
             /*
              * The handlerthat listens to bulk blacklist deletion requests.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/blacklist/bulk_delete_handler' => function (ContainerInterface $c) {
                 return function () use ($c) {
@@ -170,7 +170,7 @@ public function getFactories()
             /*
              * Alias for the blacklist entity collection, if it exists.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/blacklist/collection' => function (ContainerInterface $c) {
                 return $c->has('wpra/feeds/blacklist/collection')
@@ -183,23 +183,23 @@ public function getFactories()
     /**
      * @inheritdoc
      *
-     * @since [*next-version*]
+     * @since 4.17
      */
     public function getExtensions()
     {
         return [
             /*
              * Registers the "Blacklist" tool.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools' => function (ContainerInterface $c, $tools) {
                 return $tools + ['blacklist' => $c->get('wpra/admin/tools/blacklist/info')];
             },
             /*
              * Adds the context for the "Blacklist" tool on the "Tools" page.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/admin/tools/page/context' => function (ContainerInterface $c, $ctx) {
                 return $ctx + ['blacklist' => $c->get('wpra/admin/tools/blacklist/page/context')];
@@ -210,7 +210,7 @@ public function getExtensions()
     /**
      * @inheritdoc
      *
-     * @since [*next-version*]
+     * @since 4.17
      */
     public function run(ContainerInterface $c)
     {

diff --git a/src/Modules/FeedSourcesModule.php b/src/Modules/FeedSourcesModule.php
@@ -307,24 +307,26 @@ public function getFactories()
             /*
              * The handler that renders the source info meta box on the edit page.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/feeds/sources/meta_boxes/save/renderer' => function (ContainerInterface $c) {
                 return new RenderMetaBoxTemplateHandler(
                     $c->get('wpra/twig/collection')['admin/feeds/save-meta-box.twig'],
                     $c->get('wpra/feeds/sources/collection'),
+                    ['wprss_feed'],
                     'feed'
                 );
             },
             /*
              * The handler that renders the shortcode on the edit page.
              *
-             * @since [*next-version*]
+             * @since 4.17
              */
             'wpra/feeds/sources/meta_boxes/shortcode/renderer' => function (ContainerInterface $c) {
                 return new RenderMetaBoxTemplateHandler(
                     $c->get('wpra/twig/collection')['admin/feeds/shortcode.twig'],
                     $c->get('wpra/feeds/sources/collection'),
+                    ['wprss_feed'],
                     'feed'
                 );
             },