Merge pull request #123 from technote-space/release/v1.7.5

Release/v1.7.5

Author: technote-space

composer.lock

@@ -4,7 +4,7 @@
 Plugin URI: https://wordpress.org/plugins/marker-animation
 Description: This plugin will add "Marker animation" function
 Author: Technote
-Version: 1.7.4
+Version: 1.7.5
 Author URI: https://technote.space
 Text Domain: marker-animation
 Domain Path: /languages/

marker-animation.php

@@ -4,7 +4,7 @@ Tags: marker, marker animation, highlighter, 蛍光ペン, マーカー, アン
 Requires at least: 4.6
 Requires PHP: 5.6
 Tested up to: 5.2
-Stable tag: 1.7.4
+Stable tag: 1.7.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -41,6 +41,9 @@ This plugin needs PHP5.6 or higher.
 
 == Upgrade Notice ==
 
+= 1.7.5 =
+* [すべての差分](https://github.com/technote-space/marker-animation/pull/123)
+
 = 1.7.4 =
 * ブロックエディタでサイドバーから細かく設定できるように対応しました。 [詳細](https://github.com/technote-space/marker-animation/issues/51)
 * 設定一覧の「繰り返すかどうか」が正しく反映されないバグの修正。 [詳細](https://github.com/technote-space/marker-animation/issues/117)
@@ -84,6 +87,9 @@ This plugin needs PHP5.6 or higher.
 
 == Changelog ==
 
+= 1.7.5 (2019/4/28) =
+* Improved: [Consider incorrect argument](https://github.com/wp-content-framework/admin/issues/58)
+
 = 1.7.4 (2019/4/23) =
 * Added: [Detail settings for gutenberg](https://github.com/technote-space/marker-animation/issues/51)
 * Fixed: [Display of repeat setting](https://github.com/technote-space/marker-animation/issues/117)

readme.txt

@@ -114,25 +114,25 @@
     },
     {
         "name": "wp-content-framework/admin",
-        "version": "v0.0.29",
-        "version_normalized": "0.0.29.0",
+        "version": "v0.0.31",
+        "version_normalized": "0.0.31.0",
         "source": {
             "type": "git",
             "url": "https://github.com/wp-content-framework/admin.git",
-            "reference": "ca74b0c62b352f2e7bb993865eccdf484a6546b4"
+            "reference": "0f4b45f5389ccfa390c6fbde6c1c5e6be6c82ef3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/wp-content-framework/admin/zipball/ca74b0c62b352f2e7bb993865eccdf484a6546b4",
-            "reference": "ca74b0c62b352f2e7bb993865eccdf484a6546b4",
+            "url": "https://api.github.com/repos/wp-content-framework/admin/zipball/0f4b45f5389ccfa390c6fbde6c1c5e6be6c82ef3",
+            "reference": "0f4b45f5389ccfa390c6fbde6c1c5e6be6c82ef3",
             "shasum": ""
         },
         "require": {
             "php": ">=5.6.0",
             "wp-content-framework/controller": "~0.0.1",
             "wp-content-framework/view": "~0.0.1"
         },
-        "time": "2019-04-20T17:05:07+00:00",
+        "time": "2019-04-27T17:11:44+00:00",
         "type": "library",
         "installation-source": "dist",
         "notification-url": "https://packagist.org/downloads/",
@@ -238,17 +238,17 @@
     },
     {
         "name": "wp-content-framework/common",
-        "version": "v0.0.47",
-        "version_normalized": "0.0.47.0",
+        "version": "v0.0.48",
+        "version_normalized": "0.0.48.0",
         "source": {
             "type": "git",
             "url": "https://github.com/wp-content-framework/common.git",
-            "reference": "ebb90d1c31b481c3d3fddc120c4116a1ea485c96"
+            "reference": "d6e0e44fda166c648b37fd36d4e8893cf8ecf778"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/wp-content-framework/common/zipball/ebb90d1c31b481c3d3fddc120c4116a1ea485c96",
-            "reference": "ebb90d1c31b481c3d3fddc120c4116a1ea485c96",
+            "url": "https://api.github.com/repos/wp-content-framework/common/zipball/d6e0e44fda166c648b37fd36d4e8893cf8ecf778",
+            "reference": "d6e0e44fda166c648b37fd36d4e8893cf8ecf778",
             "shasum": ""
         },
         "require": {
@@ -258,7 +258,7 @@
             "phake/phake": "~2.0",
             "phpunit/phpunit": "~5.7"
         },
-        "time": "2019-04-18T08:20:25+00:00",
+        "time": "2019-04-25T09:57:06+00:00",
         "type": "library",
         "installation-source": "dist",
         "notification-url": "https://packagist.org/downloads/",
@@ -371,17 +371,17 @@
     },
     {
         "name": "wp-content-framework/custom_post",
-        "version": "v0.0.32",
-        "version_normalized": "0.0.32.0",
+        "version": "v0.0.33",
+        "version_normalized": "0.0.33.0",
         "source": {
             "type": "git",
             "url": "https://github.com/wp-content-framework/custom_post.git",
-            "reference": "ea2ca68121311cbc29e1823f1110a9c14deeb0a2"
+            "reference": "cef8510d72c411d78363be190b6b695471ce3203"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/wp-content-framework/custom_post/zipball/ea2ca68121311cbc29e1823f1110a9c14deeb0a2",
-            "reference": "ea2ca68121311cbc29e1823f1110a9c14deeb0a2",
+            "url": "https://api.github.com/repos/wp-content-framework/custom_post/zipball/cef8510d72c411d78363be190b6b695471ce3203",
+            "reference": "cef8510d72c411d78363be190b6b695471ce3203",
             "shasum": ""
         },
         "require": {
@@ -395,7 +395,7 @@
             "phake/phake": "~2.0",
             "phpunit/phpunit": "~5.7"
         },
-        "time": "2019-04-04T04:27:39+00:00",
+        "time": "2019-04-23T09:59:54+00:00",
         "type": "library",
         "installation-source": "dist",
         "notification-url": "https://packagist.org/downloads/",

vendor/composer/installed.json

@@ -2,7 +2,7 @@
 /**
  * WP_Framework_Admin Configs Config
  *
- * @version 0.0.22
+ * @version 0.0.30
  * @author Technote
  * @copyright Technote All Rights Reserved
  * @license http://www.opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2
@@ -18,15 +18,6 @@
 	// main menu title
 	'main_menu_title'                => '',
 
-	// contact url
-	'contact_url'                    => '',
-
-	// twitter
-	'twitter'                        => '',
-
-	// github
-	'github'                         => '',
-
 	// menu image url
 	'menu_image'                     => '',
 
@@ -42,12 +33,6 @@
 	// setting page slug
 	'setting_page_slug'              => 'setting',
 
-	// detail url
-	'detail_url'                     => '',
-
-	// github repo (user/repo)
-	'github_repo'                    => '',
-
 	// action links
 	'action_links'                   => [
 		[
@@ -65,4 +50,18 @@
 	// plugin row meta
 	'plugin_row_meta'                => [],
 
+	// twitter
+	'twitter'                        => '',
+
+	// detail url
+	'detail_url'                     => '',
+
+	// github repo (user/repo)
+	'github_repo'                    => '',
+
+	// contact url
+	'contact_url'                    => '',
+
+	// github
+	'github'                         => '',
 ];

vendor/wp-content-framework/admin/configs/config.php

@@ -2,7 +2,7 @@
 /**
  * WP_Framework_Admin Classes Models Admin
  *
- * @version 0.0.24
+ * @version 0.0.31
  * @author Technote
  * @copyright Technote All Rights Reserved
  * @license http://www.opensource.org/licenses/gpl-2.0.php GNU General Public License, version 2
@@ -182,51 +182,51 @@ private function admin_notice() {
 	/**
 	 * @param string[] $actions
 	 * @param string $plugin_file
-	 * @param array $plugin_data
+	 * @param array|null $plugin_data
 	 * @param string $context
 	 *
 	 * @return array
 	 */
 	/** @noinspection PhpUnusedPrivateMethodInspection */
-	private function plugin_action_links( array $actions, $plugin_file, array $plugin_data, $context ) {
+	private function plugin_action_links( array $actions, $plugin_file, $plugin_data, $context ) {
 		if ( $this->app->is_theme || $plugin_file !== $this->app->define->plugin_base_name ) {
 			return $actions;
 		}
 
 		$action_links = $this->parse_config_links( $this->app->get_config( 'config', 'action_links' ), $plugin_data, $context );
 		! empty( $action_links ) and $actions = array_merge( $action_links, $actions );
 
-		return $this->apply_filters( 'plugin_action_links', $actions );
+		return $this->apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
 	}
 
 	/**
 	 * @param string[] $plugin_meta
 	 * @param string $plugin_file
-	 * @param array $plugin_data
+	 * @param array|null $plugin_data
 	 * @param string $status
 	 *
 	 * @return array
 	 */
 	/** @noinspection PhpUnusedPrivateMethodInspection */
-	private function plugin_row_meta( array $plugin_meta, $plugin_file, array $plugin_data, $status ) {
+	private function plugin_row_meta( array $plugin_meta, $plugin_file, $plugin_data, $status ) {
 		if ( $this->app->is_theme || $plugin_file !== $this->app->define->plugin_base_name ) {
 			return $plugin_meta;
 		}
 
 		$plugin_row_meta = $this->parse_config_links( $this->app->get_config( 'config', 'plugin_row_meta' ), $plugin_data, $status );
 		! empty( $plugin_row_meta ) and $plugin_meta = array_merge( $plugin_meta, $plugin_row_meta );
 
-		return $this->apply_filters( 'plugin_row_meta', $plugin_meta );
+		return $this->apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
 	}
 
 	/**
 	 * @param array $links
-	 * @param $plugin_data
-	 * @param $status
+	 * @param array|null $plugin_data
+	 * @param string $status
 	 *
 	 * @return array
 	 */
-	private function parse_config_links( array $links, array $plugin_data, $status ) {
+	private function parse_config_links( array $links, $plugin_data, $status ) {
 		if ( is_array( $links ) && ! empty( $links ) ) {
 			return array_filter( $this->app->array->map( $links, function ( $setting ) use ( $plugin_data, $status ) {
 				if ( empty( $setting['url'] ) || ! isset( $setting['label'] ) ) {

vendor/wp-content-framework/admin/src/classes/models/admin.php

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wp-framework-common\n"
 "POT-Creation-Date: 2018-07-01 17:47+0900\n"
-"PO-Revision-Date: 2019-04-18 16:39+0900\n"
+"PO-Revision-Date: 2019-04-25 17:23+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -213,3 +213,6 @@ msgstr "はい"
 
 msgid "No"
 msgstr "いいえ"
+
+msgid "Deactivate plugin"
+msgstr "プラグインを停止"