From d46298db0326e577aaf164294a37ffb7ca47f914 Mon Sep 17 00:00:00 2001 From: Marcos Schratzenstaller Date: Tue, 23 Jul 2019 12:31:27 -0300 Subject: [PATCH 1/8] Remove Grunt and add pot generation using wp-cli --- composer.json | 6 +- composer.lock | 553 +++++++++++++++++++++++++++++++++++++++++++++- package-lock.json | 229 +------------------ package.json | 7 +- 4 files changed, 549 insertions(+), 246 deletions(-) diff --git a/composer.json b/composer.json index 925a044..ea93dcd 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,8 @@ "dealerdirect/phpcodesniffer-composer-installer": "*", "squizlabs/php_codesniffer": "^3.3.1", "phpcompatibility/phpcompatibility-wp": "*", - "wp-coding-standards/wpcs": "^1" + "wp-coding-standards/wpcs": "^1", + "wp-cli/i18n-command": "^2.1" }, "config": { "sort-order": true @@ -23,7 +24,8 @@ "scripts": { "phpcs": "phpcs --standard=WordPress --ignore=vendor/,node_modules/,assets/ --extensions=php -p ./", "phpcs-compat": "phpcs --extensions=php --standard=PHPCompatibilityWP --ignore=vendor/,node_modules/,assets/ --runtime-set testVersion 5.6- -p ./", - "phpcbf": "phpcbf --standard=WordPress --ignore=vendor/,node_modules/,assets/ --extensions=php -p ./" + "phpcbf": "phpcbf --standard=WordPress --ignore=vendor/,node_modules/,assets/ --extensions=php -p ./", + "makepot": "wp i18n make-pot . --headers='{ \"Report-Msgid-Bugs-To\": \"StudioPress \" }' --exclude=vendor/ --quiet" }, "support": { "issues": "https://github.com/studiopress/genesis-portfolio-pro/issues", diff --git a/composer.lock b/composer.lock index 622780c..535fc2b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f2caa6371dbdb9e6ac6a0f2439ffcad8", + "content-hash": "e72718d5a133199b3fc4f50d9f2411c0", "packages": [ { "name": "composer/installers", @@ -194,18 +194,232 @@ ], "time": "2018-10-26T13:21:45+00:00" }, + { + "name": "gettext/gettext", + "version": "v4.6.3", + "source": { + "type": "git", + "url": "https://github.com/oscarotero/Gettext.git", + "reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/oscarotero/Gettext/zipball/70c6ff2fecd275e6ef9cdd542f55939a3d1904d6", + "reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6", + "shasum": "" + }, + "require": { + "gettext/languages": "^2.3", + "php": ">=5.4.0" + }, + "require-dev": { + "illuminate/view": "*", + "phpunit/phpunit": "^4.8|^5.7|^6.5", + "squizlabs/php_codesniffer": "^3.0", + "symfony/yaml": "~2", + "twig/extensions": "*", + "twig/twig": "^1.31|^2.0" + }, + "suggest": { + "illuminate/view": "Is necessary if you want to use the Blade extractor", + "symfony/yaml": "Is necessary if you want to use the Yaml extractor/generator", + "twig/extensions": "Is necessary if you want to use the Twig extractor", + "twig/twig": "Is necessary if you want to use the Twig extractor" + }, + "type": "library", + "autoload": { + "psr-4": { + "Gettext\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Oscar Otero", + "email": "oom@oscarotero.com", + "homepage": "http://oscarotero.com", + "role": "Developer" + } + ], + "description": "PHP gettext manager", + "homepage": "https://github.com/oscarotero/Gettext", + "keywords": [ + "JS", + "gettext", + "i18n", + "mo", + "po", + "translation" + ], + "time": "2019-07-15T12:56:31+00:00" + }, + { + "name": "gettext/languages", + "version": "2.5.0", + "source": { + "type": "git", + "url": "https://github.com/mlocati/cldr-to-gettext-plural-rules.git", + "reference": "78db2d17933f0765a102f368a6663f057162ddbd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mlocati/cldr-to-gettext-plural-rules/zipball/78db2d17933f0765a102f368a6663f057162ddbd", + "reference": "78db2d17933f0765a102f368a6663f057162ddbd", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "^4" + }, + "bin": [ + "bin/export-plural-rules", + "bin/export-plural-rules.php" + ], + "type": "library", + "autoload": { + "psr-4": { + "Gettext\\Languages\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michele Locati", + "email": "mlocati@gmail.com", + "role": "Developer" + } + ], + "description": "gettext languages with plural rules", + "homepage": "https://github.com/mlocati/cldr-to-gettext-plural-rules", + "keywords": [ + "cldr", + "i18n", + "internationalization", + "l10n", + "language", + "languages", + "localization", + "php", + "plural", + "plural rules", + "plurals", + "translate", + "translations", + "unicode" + ], + "time": "2018-11-13T22:06:07+00:00" + }, + { + "name": "mck89/peast", + "version": "v1.9.2", + "source": { + "type": "git", + "url": "https://github.com/mck89/peast.git", + "reference": "7c9e487a0bb2410b3b7f27e8274cd04248b68197" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mck89/peast/zipball/7c9e487a0bb2410b3b7f27e8274cd04248b68197", + "reference": "7c9e487a0bb2410b3b7f27e8274cd04248b68197", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9.2-dev" + } + }, + "autoload": { + "psr-4": { + "Peast\\": "lib/Peast/", + "Peast\\test\\": "test/Peast/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Marchiò", + "email": "marco.mm89@gmail.com" + } + ], + "description": "Peast is PHP library that generates AST for JavaScript code", + "time": "2019-05-24T16:47:14+00:00" + }, + { + "name": "mustache/mustache", + "version": "v2.12.0", + "source": { + "type": "git", + "url": "https://github.com/bobthecow/mustache.php.git", + "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/fe8fe72e9d580591854de404cc59a1b83ca4d19e", + "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~1.11", + "phpunit/phpunit": "~3.7|~4.0|~5.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Mustache": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Justin Hileman", + "email": "justin@justinhileman.info", + "homepage": "http://justinhileman.com" + } + ], + "description": "A Mustache implementation in PHP.", + "homepage": "https://github.com/bobthecow/mustache.php", + "keywords": [ + "mustache", + "templating" + ], + "time": "2017-07-11T12:54:05+00:00" + }, { "name": "phpcompatibility/php-compatibility", - "version": "9.1.1", + "version": "9.2.0", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibility.git", - "reference": "2b63c5d284ab8857f7b1d5c240ddb507a6b2293c" + "reference": "3db1bf1e28123fd574a4ae2e9a84072826d51b5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/2b63c5d284ab8857f7b1d5c240ddb507a6b2293c", - "reference": "2b63c5d284ab8857f7b1d5c240ddb507a6b2293c", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/3db1bf1e28123fd574a4ae2e9a84072826d51b5e", + "reference": "3db1bf1e28123fd574a4ae2e9a84072826d51b5e", "shasum": "" }, "require": { @@ -219,7 +433,7 @@ "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -234,13 +448,13 @@ }, { "name": "Wim Godden", - "homepage": "https://github.com/wimg", - "role": "lead" + "role": "lead", + "homepage": "https://github.com/wimg" }, { "name": "Juliette Reinders Folmer", - "homepage": "https://github.com/jrfnl", - "role": "lead" + "role": "lead", + "homepage": "https://github.com/jrfnl" } ], "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.", @@ -250,7 +464,7 @@ "phpcs", "standards" ], - "time": "2018-12-30T23:16:27+00:00" + "time": "2019-06-27T19:58:56+00:00" }, { "name": "phpcompatibility/phpcompatibility-paragonie", @@ -352,6 +566,55 @@ ], "time": "2018-10-07T18:31:37+00:00" }, + { + "name": "rmccue/requests", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/rmccue/Requests.git", + "reference": "87932f52ffad70504d93f04f15690cf16a089546" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rmccue/Requests/zipball/87932f52ffad70504d93f04f15690cf16a089546", + "reference": "87932f52ffad70504d93f04f15690cf16a089546", + "shasum": "" + }, + "require": { + "php": ">=5.2" + }, + "require-dev": { + "requests/test-server": "dev-master" + }, + "type": "library", + "autoload": { + "psr-0": { + "Requests": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Ryan McCue", + "homepage": "http://ryanmccue.info" + } + ], + "description": "A HTTP library written in PHP, for human beings.", + "homepage": "http://github.com/rmccue/Requests", + "keywords": [ + "curl", + "fsockopen", + "http", + "idna", + "ipv6", + "iri", + "sockets" + ], + "time": "2016-10-13T00:11:37+00:00" + }, { "name": "squizlabs/php_codesniffer", "version": "3.4.2", @@ -403,6 +666,272 @@ ], "time": "2019-04-10T23:49:02+00:00" }, + { + "name": "symfony/finder", + "version": "v4.3.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a", + "reference": "33c21f7d5d3dc8a140c282854a7e13aeb5d0f91a", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "https://symfony.com", + "time": "2019-06-13T11:03:18+00:00" + }, + { + "name": "wp-cli/i18n-command", + "version": "v2.1.2", + "source": { + "type": "git", + "url": "https://github.com/wp-cli/i18n-command.git", + "reference": "e52a9a602772339a0f844bd5e9a9ac8cc8b490ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/e52a9a602772339a0f844bd5e9a9ac8cc8b490ea", + "reference": "e52a9a602772339a0f844bd5e9a9ac8cc8b490ea", + "shasum": "" + }, + "require": { + "gettext/gettext": "^4.6", + "mck89/peast": "^1.8", + "wp-cli/wp-cli": "^2" + }, + "require-dev": { + "wp-cli/scaffold-command": "^1.2 || ^2", + "wp-cli/wp-cli-tests": "^2.1" + }, + "type": "wp-cli-package", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + }, + "bundled": true, + "commands": [ + "i18n", + "i18n make-pot", + "i18n make-json" + ] + }, + "autoload": { + "psr-4": { + "WP_CLI\\I18n\\": "src/" + }, + "files": [ + "i18n-command.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Pascal Birchler", + "homepage": "https://pascalbirchler.com/" + } + ], + "description": "Provides internationalization tools for WordPress projects.", + "homepage": "https://github.com/wp-cli/i18n-command", + "time": "2019-04-25T00:31:04+00:00" + }, + { + "name": "wp-cli/mustangostang-spyc", + "version": "0.6.3", + "source": { + "type": "git", + "url": "https://github.com/wp-cli/spyc.git", + "reference": "6aa0b4da69ce9e9a2c8402dab8d43cf32c581cc7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wp-cli/spyc/zipball/6aa0b4da69ce9e9a2c8402dab8d43cf32c581cc7", + "reference": "6aa0b4da69ce9e9a2c8402dab8d43cf32c581cc7", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "4.3.*@dev" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.5.x-dev" + } + }, + "autoload": { + "psr-4": { + "Mustangostang\\": "src/" + }, + "files": [ + "includes/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "mustangostang", + "email": "vlad.andersen@gmail.com" + } + ], + "description": "A simple YAML loader/dumper class for PHP (WP-CLI fork)", + "homepage": "https://github.com/mustangostang/spyc/", + "time": "2017-04-25T11:26:20+00:00" + }, + { + "name": "wp-cli/php-cli-tools", + "version": "v0.11.11", + "source": { + "type": "git", + "url": "https://github.com/wp-cli/php-cli-tools.git", + "reference": "fe9c7c44a9e1bf2196ec51dc38da0593dbf2993f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/fe9c7c44a9e1bf2196ec51dc38da0593dbf2993f", + "reference": "fe9c7c44a9e1bf2196ec51dc38da0593dbf2993f", + "shasum": "" + }, + "require": { + "php": ">= 5.3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "cli": "lib/" + }, + "files": [ + "lib/cli/cli.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "James Logsdon", + "email": "jlogsdon@php.net", + "role": "Developer" + }, + { + "name": "Daniel Bachhuber", + "email": "daniel@handbuilt.co", + "role": "Maintainer" + } + ], + "description": "Console utilities for PHP", + "homepage": "http://github.com/wp-cli/php-cli-tools", + "keywords": [ + "cli", + "console" + ], + "time": "2018-09-04T13:28:00+00:00" + }, + { + "name": "wp-cli/wp-cli", + "version": "v2.2.0", + "source": { + "type": "git", + "url": "https://github.com/wp-cli/wp-cli.git", + "reference": "193f08f48585326bc1f1648349201531eeda2ee5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/193f08f48585326bc1f1648349201531eeda2ee5", + "reference": "193f08f48585326bc1f1648349201531eeda2ee5", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "mustache/mustache": "~2.4", + "php": "^5.4 || ^7.0", + "rmccue/requests": "~1.6", + "symfony/finder": ">2.7", + "wp-cli/mustangostang-spyc": "^0.6.3", + "wp-cli/php-cli-tools": "~0.11.2" + }, + "require-dev": { + "roave/security-advisories": "dev-master", + "wp-cli/db-command": "^1.3 || ^2", + "wp-cli/entity-command": "^1.2 || ^2", + "wp-cli/extension-command": "^1.1 || ^2", + "wp-cli/package-command": "^1 || ^2", + "wp-cli/wp-cli-tests": "^2.1" + }, + "suggest": { + "ext-readline": "Include for a better --prompt implementation", + "ext-zip": "Needed to support extraction of ZIP archives when doing downloads or updates" + }, + "bin": [ + "bin/wp", + "bin/wp.bat" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "autoload": { + "psr-0": { + "WP_CLI": "php" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "WP-CLI framework", + "homepage": "https://wp-cli.org", + "keywords": [ + "cli", + "wordpress" + ], + "time": "2019-04-25T05:38:33+00:00" + }, { "name": "wp-coding-standards/wpcs", "version": "1.2.1", @@ -458,4 +987,4 @@ "platform-dev": { "php": "^5.6 || ^7" } -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index cc3e1a3..385b71f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,230 +1,5 @@ { "name": "genesis-portfolio-pro", - "version": "1.2.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "bluebird": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "encoding": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", - "dev": true, - "requires": { - "iconv-lite": "~0.4.13" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "gettext-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-3.1.1.tgz", - "integrity": "sha512-vNhWcqXEtZPs5Ft1ReA34g7ByWotpcOIeJvXVy2jF3/G2U9v6W0wG4Z4hXzcU8R//jArqkgHcVCGgGqa4vxVlQ==", - "dev": true, - "requires": { - "encoding": "^0.1.12", - "readable-stream": "^3.2.0", - "safe-buffer": "^5.1.2" - }, - "dependencies": { - "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "glob": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", - "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.2", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } - } - }, - "node-wp-i18n": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/node-wp-i18n/-/node-wp-i18n-1.2.3.tgz", - "integrity": "sha512-YMzMcsjXbGYDB9vHyb289CYXAGmXhcNLbeTlOnWgPNkZd9xrovcbRd7cQyKd9BQHOjS7Nw8WCbJ7nvtR7rc0rg==", - "dev": true, - "requires": { - "bluebird": "^3.4.1", - "gettext-parser": "^3.1.0", - "glob": "^7.0.5", - "lodash": "^4.14.2", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "tmp": "^0.0.33" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } + "version": "1.2.1", + "lockfileVersion": 1 } diff --git a/package.json b/package.json index 5647bd1..d7eb39c 100644 --- a/package.json +++ b/package.json @@ -16,11 +16,8 @@ "url": "https://github.com/studiopress/genesis-portfolio-pro/issues" }, "homepage": "https://github.com/studiopress/genesis-portfolio-pro#readme", - "devDependencies": { - "node-wp-i18n": "^1.2.3" - }, + "devDependencies": {}, "scripts": { - "makepot": "wpi18n makepot --exclude=vendor,node_modules", - "addtextdomain": "wpi18n addtextdomain --exclude=vendor,node_modules" + "makepot": "composer makepot" } } From 29656b31a27a7e3178f3efa05d60a92a07dc357b Mon Sep 17 00:00:00 2001 From: Marcos Schratzenstaller Date: Tue, 23 Jul 2019 14:24:06 -0300 Subject: [PATCH 2/8] Fix spacing issues and add .editorconfig file --- .editorconfig | 21 +++++++++++++++++++++ composer.json | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..9cef246 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +# This file is for unifying the coding style for different editors and IDEs +# editorconfig.org + +# WordPress Coding Standards +# http://make.wordpress.org/core/handbook/coding-standards/ + +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +indent_style = tab + +[*.yml] +indent_style = space +indent_size = 2 + +[*.md] +trim_trailing_whitespace = false diff --git a/composer.json b/composer.json index ea93dcd..5f36418 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "squizlabs/php_codesniffer": "^3.3.1", "phpcompatibility/phpcompatibility-wp": "*", "wp-coding-standards/wpcs": "^1", - "wp-cli/i18n-command": "^2.1" + "wp-cli/i18n-command": "^2.1" }, "config": { "sort-order": true @@ -25,7 +25,7 @@ "phpcs": "phpcs --standard=WordPress --ignore=vendor/,node_modules/,assets/ --extensions=php -p ./", "phpcs-compat": "phpcs --extensions=php --standard=PHPCompatibilityWP --ignore=vendor/,node_modules/,assets/ --runtime-set testVersion 5.6- -p ./", "phpcbf": "phpcbf --standard=WordPress --ignore=vendor/,node_modules/,assets/ --extensions=php -p ./", - "makepot": "wp i18n make-pot . --headers='{ \"Report-Msgid-Bugs-To\": \"StudioPress \" }' --exclude=vendor/ --quiet" + "makepot": "wp i18n make-pot . --headers='{ \"Report-Msgid-Bugs-To\": \"StudioPress \" }' --exclude=vendor/ --quiet" }, "support": { "issues": "https://github.com/studiopress/genesis-portfolio-pro/issues", From d422fd3708a39d8b581c6e30b5c6bfefe64f5a35 Mon Sep 17 00:00:00 2001 From: Fawad Tiemoerie Date: Tue, 21 Jan 2020 13:38:36 +0100 Subject: [PATCH 3/8] Added REST-API Support * Added rest-api support for gutenberg --- lib/post-types-and-taxonomies.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/post-types-and-taxonomies.php b/lib/post-types-and-taxonomies.php index a5df17c..faf2a12 100644 --- a/lib/post-types-and-taxonomies.php +++ b/lib/post-types-and-taxonomies.php @@ -40,7 +40,10 @@ 'with_front' => false, ), 'show_ui' => true, - 'show_tagcloud' => false, + 'show_tagcloud' => false, + 'show_in_rest' => true, + 'rest_base' => 'portfolio-type', + 'rest_controller_class' => 'WP_REST_Terms_Controller', ) ); @@ -67,7 +70,8 @@ 'has_archive' => true, 'hierarchical' => true, 'menu_icon' => 'dashicons-format-gallery', - 'public' => true, + 'public' => true, + 'show_in_rest' => true, 'rewrite' => array( 'slug' => _x( 'portfolio', 'portfolio slug', 'genesis-portfolio-pro' ), 'with_front' => false, From 7fa21fb179d75e478de390e3ad1984e52d36e3ac Mon Sep 17 00:00:00 2001 From: Marcos Antonio Schratzenstaller Date: Tue, 21 Jan 2020 10:07:16 -0300 Subject: [PATCH 4/8] Fix PHPCS violations --- lib/post-types-and-taxonomies.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/post-types-and-taxonomies.php b/lib/post-types-and-taxonomies.php index faf2a12..f7203a1 100644 --- a/lib/post-types-and-taxonomies.php +++ b/lib/post-types-and-taxonomies.php @@ -14,7 +14,7 @@ 'portfolio-type', 'portfolio', array( - 'labels' => array( + 'labels' => array( 'name' => _x( 'Portfolio Types', 'taxonomy general name', 'genesis-portfolio-pro' ), 'singular_name' => _x( 'Portfolio Type', 'taxonomy singular name', 'genesis-portfolio-pro' ), 'search_items' => __( 'Search Portfolio Types', 'genesis-portfolio-pro' ), @@ -32,18 +32,18 @@ 'parent_item' => null, 'parent_item_colon' => null, ), - 'exclude_from_search' => true, - 'has_archive' => true, - 'hierarchical' => true, - 'rewrite' => array( + 'exclude_from_search' => true, + 'has_archive' => true, + 'hierarchical' => true, + 'rewrite' => array( 'slug' => _x( 'portfolio-type', 'portfolio-type slug', 'genesis-portfolio-pro' ), 'with_front' => false, ), - 'show_ui' => true, - 'show_tagcloud' => false, - 'show_in_rest' => true, - 'rest_base' => 'portfolio-type', - 'rest_controller_class' => 'WP_REST_Terms_Controller', + 'show_ui' => true, + 'show_tagcloud' => false, + 'show_in_rest' => true, + 'rest_base' => 'portfolio-type', + 'rest_controller_class' => 'WP_REST_Terms_Controller', ) ); @@ -70,8 +70,8 @@ 'has_archive' => true, 'hierarchical' => true, 'menu_icon' => 'dashicons-format-gallery', - 'public' => true, - 'show_in_rest' => true, + 'public' => true, + 'show_in_rest' => true, 'rewrite' => array( 'slug' => _x( 'portfolio', 'portfolio slug', 'genesis-portfolio-pro' ), 'with_front' => false, From da200dcbd85fdc02586b98a0ebda57af487f6025 Mon Sep 17 00:00:00 2001 From: Nick Cernis Date: Wed, 8 Apr 2020 18:21:41 +0200 Subject: [PATCH 5/8] Bump tested up to to 5.4 (#46) --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 3512921..643d04e 100644 --- a/readme.txt +++ b/readme.txt @@ -2,7 +2,7 @@ Contributors: nathanrice, studiopress, wpmuguru, nick_thegeek, bgardner, marksabbath, modernnerd Tags: genesis, portfolio, templates Requires at least: 4.4 -Tested up to: 5.2.2 +Tested up to: 5.4 Stable tag: 1.2.1 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html From f80cbdf09a415ec90f28f6f0e985a426d99ab6e5 Mon Sep 17 00:00:00 2001 From: Ben Moore <7051219+BMO-tech@users.noreply.github.com> Date: Mon, 13 Apr 2020 10:04:53 -0500 Subject: [PATCH 6/8] ci: update circleci config to allow deployment to the WP repo (#47) --- .circleci/config.yml | 174 ++++++++++++++++++++++++++++++++++++++++--- plugin.php | 2 - 2 files changed, 163 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1b0614d..1fdd3c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,22 +1,174 @@ version: 2.1 -jobs: - test: +commands: + install_dependencies: + description: "Install development dependencies." + steps: + - run: composer install + + mkdir_artifacts: + description: "Make Artifacts directory" + steps: + - run: + command: | + [ ! -d "/tmp/artifacts" ] && mkdir /tmp/artifacts &>/dev/null + + set_verision_variable: + description: "Set the VERSION environment variable" + steps: + - run: + command: | + echo "export VERSION=$(grep 'Version:' /tmp/src/plugin.php | awk -F: '{print $2}' | sed 's/^\s//')" >> ${BASH_ENV} + + show_pwd_info: + description: "Show information about the current directory" + steps: + - run: pwd + - run: ls -lash + + svn_setup: + description: "Setup SVN" + steps: + - run: echo "export SLUG=$(grep '@package' /tmp/src/plugin.php | awk -F ' ' '{print $3}' | sed 's/^\s//')" >> ${BASH_ENV} + - run: svn co https://plugins.svn.wordpress.org/${SLUG} --depth=empty . + - run: svn up trunk + - run: svn up tags --depth=empty + - run: find ./trunk -not -path "./trunk" -delete + - run: cp -r /tmp/src/. ./trunk + - run: svn propset svn:ignore -F ./trunk/.svnignore ./trunk + + svn_add_changes: + description: "Add changes to SVN" + steps: + - run: + command: if [[ ! -z $(svn st | grep ^\!) ]]; then svn st | grep ^! | awk '{print " --force "$2}' | xargs -0r svn rm; fi + - run: svn add --force . + + svn_create_tag: + description: "Create a SVN tag" + steps: + - set_verision_variable + - run: svn cp trunk tags/${VERSION} + + svn_commit: + description: "Commit changes to SVN" + steps: + - set_verision_variable + - run: svn ci -m "Tagging ${VERSION} from Github" --no-auth-cache --non-interactive --username "${SVN_USERNAME}" --password "${SVN_PASSWORD}" + +executors: + base: + docker: + - image: circleci/buildpack-deps:latest + working_directory: /tmp + php_node: docker: - image: circleci/php:7.3.3-stretch-node-browsers + working_directory: /tmp/src + +jobs: + checkout: + executor: base + steps: + - mkdir_artifacts + - checkout: + path: src + - persist_to_workspace: + root: /tmp + paths: + - src + + checks: + executor: php_node steps: - - checkout - - prepare-environment + - attach_workspace: + at: /tmp + - install_dependencies - run: composer phpcs -commands: - prepare-environment: - description: "Install dependencies." - steps: - - run: composer install + deploy_svn_branch: + executor: base + working_directory: /tmp/artifacts + steps: + - attach_workspace: + at: /tmp + - svn_setup + - svn_add_changes + - svn_commit + + deploy_svn_tag: + executor: base + working_directory: /tmp/artifacts + steps: + - attach_workspace: + at: /tmp + - svn_setup + - svn_create_tag + - svn_add_changes + - svn_commit workflows: version: 2 - check-wp-cs: + checks: + jobs: + - checkout: + filters: + branches: + ignore: + - master + - checks: + requires: + - checkout + filters: + branches: + ignore: + - master + + branch_deploy: + jobs: + - checkout: + filters: + branches: + only: + - master + - checks: + requires: + - checkout + filters: + branches: + only: + - master + - deploy_svn_branch: + context: genesis-svn + requires: + - checks + filters: + branches: + only: + - master + + tag_deploy: jobs: - - test + - checkout: + filters: + tags: + only: /^\d+\.\d+\.\d+$/ + branches: + ignore: /.*/ + - checks: + requires: + - checkout + filters: + tags: + only: /^\d+\.\d+\.\d+$/ + branches: + ignore: /.*/ + - deploy_svn_tag: + context: genesis-svn + requires: + - checks + filters: + tags: + only: /^\d+\.\d+\.\d+$/ + branches: + ignore: /.*/ diff --git a/plugin.php b/plugin.php index be70afe..82cc30e 100644 --- a/plugin.php +++ b/plugin.php @@ -14,8 +14,6 @@ * Author URI: https://www.studiopress.com * Text Domain: genesis-portfolio-pro * Domain Path: /languages - * - * @package Genesis Portfolio Pro */ require_once plugin_dir_path( __FILE__ ) . 'genesis-portfolio-pro.php'; From 10d8064226f38d5a10f1f9f188b5fb13178f9ad0 Mon Sep 17 00:00:00 2001 From: Ben Moore Date: Wed, 15 Apr 2020 15:06:35 -0500 Subject: [PATCH 7/8] ci: minor updates to circleci config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1fdd3c3..e21e8ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ commands: steps: - run: command: | - echo "export VERSION=$(grep 'Version:' /tmp/src/plugin.php | awk -F: '{print $2}' | sed 's/^\s//')" >> ${BASH_ENV} + echo "export VERSION=$(git -C /tmp/src describe --tags --abbrev=0)" >> ${BASH_ENV} show_pwd_info: description: "Show information about the current directory" From a69797918b43ced671c96e11a2790055d581b7c2 Mon Sep 17 00:00:00 2001 From: Nick Cernis Date: Thu, 16 Apr 2020 12:47:57 +0200 Subject: [PATCH 8/8] Prepare Genesis Portfolio Pro 1.2.2 for release (#49) * Typo in description * Bump version to 1.2.2 * Update dev dependencies * Fix standards * Update POT file * Add .circleci to .svnignore Co-authored-by: Nathan Rice --- .svnignore | 1 + composer.json | 13 +- composer.lock | 85 ++++----- languages/genesis-portfolio-pro.pot | 168 +++++++++--------- ...ass-genesis-portfolio-archive-settings.php | 2 +- package.json | 4 +- plugin.php | 2 +- readme.txt | 6 +- 8 files changed, 144 insertions(+), 137 deletions(-) diff --git a/.svnignore b/.svnignore index b74f328..1eb3fe1 100644 --- a/.svnignore +++ b/.svnignore @@ -1,3 +1,4 @@ +.circleci .git .gitignore .gitattributes diff --git a/composer.json b/composer.json index 5f36418..e372ff3 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "studiopress/genesis-portfolio-pro", "type": "wordpress-plugin", - "description": "Plugin that add a new Portfolio post type where you can add portfolio entries with images and galleries to show of your visual content.", + "description": "Plugin that add a new Portfolio post type where you can add portfolio entries with images and galleries to show off your visual content.", "homepage": "https://github.com/studiopress/genesis-portfolio-pro", "license": "GPL-2.0-or-later", "require": { @@ -10,11 +10,11 @@ }, "require-dev": { "php": "^5.6 || ^7", - "dealerdirect/phpcodesniffer-composer-installer": "*", - "squizlabs/php_codesniffer": "^3.3.1", - "phpcompatibility/phpcompatibility-wp": "*", - "wp-coding-standards/wpcs": "^1", - "wp-cli/i18n-command": "^2.1" + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2", + "squizlabs/php_codesniffer": "^3.5", + "phpcompatibility/phpcompatibility-wp": "^2.1", + "wp-coding-standards/wpcs": "^2.2", + "wp-cli/i18n-command": "^2.2" }, "config": { "sort-order": true @@ -32,4 +32,3 @@ "source": "https://github.com/studiopress/genesis-portfolio-pro" } } - diff --git a/composer.lock b/composer.lock index 535fc2b..26082c6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e72718d5a133199b3fc4f50d9f2411c0", + "content-hash": "60fd357c0e8c2449f7d03aec42c7b079", "packages": [ { "name": "composer/installers", @@ -130,16 +130,16 @@ "packages-dev": [ { "name": "dealerdirect/phpcodesniffer-composer-installer", - "version": "v0.5.0", + "version": "v0.6.2", "source": { "type": "git", "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", - "reference": "e749410375ff6fb7a040a68878c656c2e610b132" + "reference": "8001af8eb107fbfcedc31a8b51e20b07d85b457a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132", - "reference": "e749410375ff6fb7a040a68878c656c2e610b132", + "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/8001af8eb107fbfcedc31a8b51e20b07d85b457a", + "reference": "8001af8eb107fbfcedc31a8b51e20b07d85b457a", "shasum": "" }, "require": { @@ -192,19 +192,19 @@ "stylecheck", "tests" ], - "time": "2018-10-26T13:21:45+00:00" + "time": "2020-01-29T20:22:20+00:00" }, { "name": "gettext/gettext", "version": "v4.6.3", "source": { "type": "git", - "url": "https://github.com/oscarotero/Gettext.git", + "url": "https://github.com/php-gettext/Gettext.git", "reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/oscarotero/Gettext/zipball/70c6ff2fecd275e6ef9cdd542f55939a3d1904d6", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/70c6ff2fecd275e6ef9cdd542f55939a3d1904d6", "reference": "70c6ff2fecd275e6ef9cdd542f55939a3d1904d6", "shasum": "" }, @@ -261,12 +261,12 @@ "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/mlocati/cldr-to-gettext-plural-rules.git", + "url": "https://github.com/php-gettext/Languages.git", "reference": "78db2d17933f0765a102f368a6663f057162ddbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mlocati/cldr-to-gettext-plural-rules/zipball/78db2d17933f0765a102f368a6663f057162ddbd", + "url": "https://api.github.com/repos/php-gettext/Languages/zipball/78db2d17933f0765a102f368a6663f057162ddbd", "reference": "78db2d17933f0765a102f368a6663f057162ddbd", "shasum": "" }, @@ -518,16 +518,16 @@ }, { "name": "phpcompatibility/phpcompatibility-wp", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git", - "reference": "cb303f0067cd5b366a41d4fb0e254fb40ff02efd" + "reference": "41bef18ba688af638b7310666db28e1ea9158b2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/cb303f0067cd5b366a41d4fb0e254fb40ff02efd", - "reference": "cb303f0067cd5b366a41d4fb0e254fb40ff02efd", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/41bef18ba688af638b7310666db28e1ea9158b2f", + "reference": "41bef18ba688af638b7310666db28e1ea9158b2f", "shasum": "" }, "require": { @@ -535,10 +535,10 @@ "phpcompatibility/phpcompatibility-paragonie": "^1.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3" + "dealerdirect/phpcodesniffer-composer-installer": "^0.5" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -564,7 +564,7 @@ "standards", "wordpress" ], - "time": "2018-10-07T18:31:37+00:00" + "time": "2019-08-28T14:22:28+00:00" }, { "name": "rmccue/requests", @@ -617,16 +617,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.4.2", + "version": "3.5.4", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8" + "reference": "dceec07328401de6211037abbb18bda423677e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", - "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", + "reference": "dceec07328401de6211037abbb18bda423677e26", "shasum": "" }, "require": { @@ -664,7 +664,7 @@ "phpcs", "standards" ], - "time": "2019-04-10T23:49:02+00:00" + "time": "2020-01-30T22:20:29+00:00" }, { "name": "symfony/finder", @@ -717,26 +717,26 @@ }, { "name": "wp-cli/i18n-command", - "version": "v2.1.2", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/wp-cli/i18n-command.git", - "reference": "e52a9a602772339a0f844bd5e9a9ac8cc8b490ea" + "reference": "379d2b07e8555efb2a6ccd94ef3d75414aa03a88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/e52a9a602772339a0f844bd5e9a9ac8cc8b490ea", - "reference": "e52a9a602772339a0f844bd5e9a9ac8cc8b490ea", + "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/379d2b07e8555efb2a6ccd94ef3d75414aa03a88", + "reference": "379d2b07e8555efb2a6ccd94ef3d75414aa03a88", "shasum": "" }, "require": { - "gettext/gettext": "^4.6", + "gettext/gettext": "^4.6.3", "mck89/peast": "^1.8", "wp-cli/wp-cli": "^2" }, "require-dev": { "wp-cli/scaffold-command": "^1.2 || ^2", - "wp-cli/wp-cli-tests": "^2.1" + "wp-cli/wp-cli-tests": "^2.1.3" }, "type": "wp-cli-package", "extra": { @@ -770,7 +770,7 @@ ], "description": "Provides internationalization tools for WordPress projects.", "homepage": "https://github.com/wp-cli/i18n-command", - "time": "2019-04-25T00:31:04+00:00" + "time": "2019-08-13T16:32:54+00:00" }, { "name": "wp-cli/mustangostang-spyc", @@ -934,27 +934,29 @@ }, { "name": "wp-coding-standards/wpcs", - "version": "1.2.1", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git", - "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c" + "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", + "reference": "b5a453203114cc2284b1a614c4953456fbe4f546" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c", - "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c", + "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/b5a453203114cc2284b1a614c4953456fbe4f546", + "reference": "b5a453203114cc2284b1a614c4953456fbe4f546", "shasum": "" }, "require": { - "php": ">=5.3", - "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2" + "php": ">=5.4", + "squizlabs/php_codesniffer": "^3.3.1" }, "require-dev": { - "phpcompatibility/php-compatibility": "^9.0" + "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6", + "phpcompatibility/php-compatibility": "^9.0", + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically." + "dealerdirect/phpcodesniffer-composer-installer": "^0.6 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically." }, "type": "phpcodesniffer-standard", "notification-url": "https://packagist.org/downloads/", @@ -964,7 +966,7 @@ "authors": [ { "name": "Contributors", - "homepage": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/graphs/contributors" + "homepage": "https://github.com/WordPress/WordPress-Coding-Standards/graphs/contributors" } ], "description": "PHP_CodeSniffer rules (sniffs) to enforce WordPress coding conventions", @@ -973,7 +975,7 @@ "standards", "wordpress" ], - "time": "2018-12-18T09:43:51+00:00" + "time": "2020-02-04T02:52:06+00:00" } ], "aliases": [], @@ -986,5 +988,6 @@ }, "platform-dev": { "php": "^5.6 || ^7" - } + }, + "plugin-api-version": "1.1.0" } diff --git a/languages/genesis-portfolio-pro.pot b/languages/genesis-portfolio-pro.pot index 1fb70b6..f5ca199 100644 --- a/languages/genesis-portfolio-pro.pot +++ b/languages/genesis-portfolio-pro.pot @@ -1,18 +1,38 @@ -# Copyright (C) 2019 StudioPress -# This file is distributed under the same license as the Genesis Portfolio Pro package. +# Copyright (C) 2020 StudioPress +# This file is distributed under the same license as the Genesis Portfolio Pro plugin. msgid "" msgstr "" -"Project-Id-Version: Genesis Portfolio Pro 1.2.1\n" -"Report-Msgid-Bugs-To: " -"https://wordpress.org/support/plugin/genesis-portfolio-pro\n" -"POT-Creation-Date: 2019-07-11 14:42:10+00:00\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-MO-DA HO:MI+ZONE\n" +"Project-Id-Version: Genesis Portfolio Pro 1.2.2\n" +"Report-Msgid-Bugs-To: StudioPress \n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"X-Generator: node-wp-i18n 1.2.3\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2020-04-15T16:59:10+00:00\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"X-Generator: WP-CLI 2.2.0\n" +"X-Domain: genesis-portfolio-pro\n" + +#. Plugin Name of the plugin +msgid "Genesis Portfolio Pro" +msgstr "" + +#. Plugin URI of the plugin +msgid "https://wordpress.org/plugins/genesis-portfolio-pro/" +msgstr "" + +#. Description of the plugin +msgid "Adds default portfolio to any Genesis HTML5 theme." +msgstr "" + +#. Author of the plugin +msgid "StudioPress" +msgstr "" + +#. Author URI of the plugin +msgid "https://www.studiopress.com" +msgstr "" #: lib/classes/class-genesis-portfolio-archive-settings.php:36 msgid "Items Per Page" @@ -34,6 +54,16 @@ msgstr "" msgid "Genesis - Portfolio" msgstr "" +#: lib/post-types-and-taxonomies.php:18 +msgctxt "taxonomy general name" +msgid "Portfolio Types" +msgstr "" + +#: lib/post-types-and-taxonomies.php:19 +msgctxt "taxonomy singular name" +msgid "Portfolio Type" +msgstr "" + #: lib/post-types-and-taxonomies.php:20 msgid "Search Portfolio Types" msgstr "" @@ -83,42 +113,77 @@ msgstr "" msgid "Portfolio Types" msgstr "" +#: lib/post-types-and-taxonomies.php:39 +msgctxt "portfolio-type slug" +msgid "portfolio-type" +msgstr "" + +#: lib/post-types-and-taxonomies.php:55 +msgctxt "post type general name" +msgid "Portfolio Items" +msgstr "" + +#: lib/post-types-and-taxonomies.php:56 +msgctxt "post type singular name" +msgid "Portfolio Item" +msgstr "" + #: lib/post-types-and-taxonomies.php:57 -msgid "Add New Portfolio Item" +msgctxt "admin menu" +msgid "Portfolio Items" msgstr "" #: lib/post-types-and-taxonomies.php:58 -msgid "New Portfolio Item" +msgctxt "add new on admin bar" +msgid "Portfolio Item" msgstr "" #: lib/post-types-and-taxonomies.php:59 -msgid "Edit Portfolio Item" +msgctxt "Portfolio Item" +msgid "Add New" msgstr "" #: lib/post-types-and-taxonomies.php:60 -msgid "View Portfolio Item" +msgid "Add New Portfolio Item" msgstr "" #: lib/post-types-and-taxonomies.php:61 -msgid "All Portfolio Items" +msgid "New Portfolio Item" msgstr "" #: lib/post-types-and-taxonomies.php:62 -msgid "Search Portfolio Items" +msgid "Edit Portfolio Item" msgstr "" #: lib/post-types-and-taxonomies.php:63 -msgid "Parent Portfolio Items:" +msgid "View Portfolio Item" msgstr "" #: lib/post-types-and-taxonomies.php:64 -msgid "No Portfolio Items found." +msgid "All Portfolio Items" msgstr "" #: lib/post-types-and-taxonomies.php:65 +msgid "Search Portfolio Items" +msgstr "" + +#: lib/post-types-and-taxonomies.php:66 +msgid "Parent Portfolio Items:" +msgstr "" + +#: lib/post-types-and-taxonomies.php:67 +msgid "No Portfolio Items found." +msgstr "" + +#: lib/post-types-and-taxonomies.php:68 msgid "No Portfolio Items found in Trash." msgstr "" +#: lib/post-types-and-taxonomies.php:76 +msgctxt "portfolio slug" +msgid "portfolio" +msgstr "" + #: lib/views/admin/archive-settings/posts-per-page-meta.php:14 msgid "Archives show at most" msgstr "" @@ -263,68 +328,3 @@ msgstr "" #: lib/views/widget/portfolio.php:108 msgid "(no title)" msgstr "" - -#. Plugin Name of the plugin/theme -msgid "Genesis Portfolio Pro" -msgstr "" - -#. Plugin URI of the plugin/theme -msgid "https://wordpress.org/plugins/genesis-portfolio-pro/" -msgstr "" - -#. Description of the plugin/theme -msgid "Adds default portfolio to any Genesis HTML5 theme." -msgstr "" - -#. Author of the plugin/theme -msgid "StudioPress" -msgstr "" - -#. Author URI of the plugin/theme -msgid "https://www.studiopress.com" -msgstr "" - -#: lib/post-types-and-taxonomies.php:18 -msgctxt "taxonomy general name" -msgid "Portfolio Types" -msgstr "" - -#: lib/post-types-and-taxonomies.php:19 -msgctxt "taxonomy singular name" -msgid "Portfolio Type" -msgstr "" - -#: lib/post-types-and-taxonomies.php:39 -msgctxt "portfolio-type slug" -msgid "portfolio-type" -msgstr "" - -#: lib/post-types-and-taxonomies.php:52 -msgctxt "post type general name" -msgid "Portfolio Items" -msgstr "" - -#: lib/post-types-and-taxonomies.php:53 -msgctxt "post type singular name" -msgid "Portfolio Item" -msgstr "" - -#: lib/post-types-and-taxonomies.php:54 -msgctxt "admin menu" -msgid "Portfolio Items" -msgstr "" - -#: lib/post-types-and-taxonomies.php:55 -msgctxt "add new on admin bar" -msgid "Portfolio Item" -msgstr "" - -#: lib/post-types-and-taxonomies.php:56 -msgctxt "Portfolio Item" -msgid "Add New" -msgstr "" - -#: lib/post-types-and-taxonomies.php:72 -msgctxt "portfolio slug" -msgid "portfolio" -msgstr "" \ No newline at end of file diff --git a/lib/classes/class-genesis-portfolio-archive-settings.php b/lib/classes/class-genesis-portfolio-archive-settings.php index 3de4d70..6f0c2d5 100644 --- a/lib/classes/class-genesis-portfolio-archive-settings.php +++ b/lib/classes/class-genesis-portfolio-archive-settings.php @@ -68,7 +68,7 @@ public function posts_per_page_metabox() { $label_attr = $this->settings_field . '-posts_per_page'; $name_attr = $this->settings_field . '[posts_per_page]'; - $value = $opts['posts_per_page'] ?: get_option( 'posts_per_page' ); + $value = $opts['posts_per_page'] ?: get_option( 'posts_per_page' ); // phpcs:ignore WordPress.PHP.DisallowShortTernary include GENESIS_PORTFOLIO_VIEWS . '/admin/archive-settings/posts-per-page-meta.php'; diff --git a/package.json b/package.json index d7eb39c..7ba83b5 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,10 @@ "name": "genesis-portfolio-pro", "main_plugin_file": "plugin", "title": "Genesis Portfolio Pro", - "version": "1.2.1", + "version": "1.2.2", "license": "GPL-2.0-or-later", "licenseuri": "https://www.gnu.org/licenses/gpl-2.0.html", - "description": "Plugin that add a new Portfolio post type where you can add portfolio entries with images and galleries to show of your visual content.", + "description": "Plugin that add a new Portfolio post type where you can add portfolio entries with images and galleries to show off your visual content.", "main": "Gruntfile.js", "repository": { "type": "git", diff --git a/plugin.php b/plugin.php index 82cc30e..59b67a6 100644 --- a/plugin.php +++ b/plugin.php @@ -9,7 +9,7 @@ * Plugin Name: Genesis Portfolio Pro * Plugin URI: https://wordpress.org/plugins/genesis-portfolio-pro/ * Description: Adds default portfolio to any Genesis HTML5 theme. - * Version: 1.2.1 + * Version: 1.2.2 * Author: StudioPress * Author URI: https://www.studiopress.com * Text Domain: genesis-portfolio-pro diff --git a/readme.txt b/readme.txt index 643d04e..325d458 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: nathanrice, studiopress, wpmuguru, nick_thegeek, bgardner, marksab Tags: genesis, portfolio, templates Requires at least: 4.4 Tested up to: 5.4 -Stable tag: 1.2.1 +Stable tag: 1.2.2 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html @@ -30,6 +30,10 @@ Custom templates are supported using the WordPress template hierarchy and the po == Changelog == += 1.2.2 = +* REST: Expose the Portfolio post type and Portfolio Type taxonomy to the REST API. +* Tooling: Generate language file with WP-CLI instead of Node.js. + = 1.2.1 = * Conform to WordPress Development Standards for PHP