From 7acc16c27c7420e08d70c777740e1ee7690cd282 Mon Sep 17 00:00:00 2001 From: Josh Rathke Date: Sat, 28 Mar 2015 10:57:05 -0600 Subject: [PATCH 1/5] Wordpress Coding Standards Adjustments --- .travis.yml | 110 ++++++++++++++++ 404.php | 12 +- archive.php | 2 +- codesniffer.ruleset.xml | 19 +++ comments.php | 75 ++++++----- content.php | 4 +- footer.php | 10 +- header.php | 26 ++-- hero.php | 18 +-- index.php | 8 +- kitchen-sink.php | 4 +- library/cleanup.php | 246 +++++++++++++++++------------------ library/custom-header.php | 36 ++--- library/enqueue-scripts.php | 50 +++---- library/entry-meta.php | 10 +- library/foundation.php | 158 +++++++++++----------- library/menu-walker.php | 66 +++++----- library/navigation.php | 46 +++---- library/offcanvas-walker.php | 52 ++++---- library/theme-support.php | 28 ++-- library/widget-areas.php | 38 +++--- page-full.php | 4 +- page-sidebar-left.php | 16 +-- page.php | 14 +- parts/off-canvas-menu.php | 2 +- parts/top-bar.php | 6 +- search.php | 10 +- searchform.php | 16 +-- sidebar-left.php | 6 +- sidebar.php | 6 +- single.php | 16 +-- woocommerce.php | 14 +- 32 files changed, 628 insertions(+), 500 deletions(-) create mode 100644 .travis.yml create mode 100644 codesniffer.ruleset.xml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..1f7529664 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,110 @@ +# Travis CI (MIT License) configuration file for the FoundationPress WordPress theme +# @link https://travis-ci.org/ + +# For use with the FoundationPress WordPress theme +# @link https://github.com/olefredrik/FoundationPress + +# Declare project language. +# @link http://about.travis-ci.org/docs/user/languages/php/ +language: php + +# Declare versions of PHP to use. Use one decimal max. +php: + # aliased to a recent 5.5.x version + - "5.5" + # aliased to a recent 5.4.x version + - "5.4" + # aliased to a recent 5.3.x version + - "5.3" + # Current $required_php_version for WordPress: 5.2.4 + - "5.2" + +# Declare which versions of WordPress to test against. +# Also declare whether or not to test in Multisite. +env: + # Trunk + # @link https://github.com/WordPress/WordPress + - WP_VERSION=master WP_MULTISITE=0 + # WordPress 4.1 + # @link https://github.com/WordPress/WordPress/tree/4.1-branch + - WP_VERSION=4.1 WP_MULTISITE=0 + # WordPress 4.0 + # @link https://github.com/WordPress/WordPress/tree/4.0-branch + - WP_VERSION=4.0 WP_MULTISITE=0 + +# Declare 5.6 beta in test matrix. +# @link https://buddypress.trac.wordpress.org/ticket/5620 +# @link http://docs.travis-ci.com/user/build-configuration/ +matrix: + include: + - php: 5.6 + env: WP_VERSION=master + allow_failures: + - php: 5.6 + fast_finish: true + +# Use this to prepare the system to install prerequisites or dependencies. +# e.g. sudo apt-get update. +# Failures in this section will result in build status 'errored'. +# before_install: + +# Use this to prepare your build for testing. +# e.g. copy database configurations, environment variables, etc. +# Failures in this section will result in build status 'errored'. +before_script: + # Set up WordPress installation. + - export WP_DEVELOP_DIR=/tmp/wordpress/ + - mkdir -p $WP_DEVELOP_DIR + # Use the Git mirror of WordPress. + - git clone --depth=1 --branch="$WP_VERSION" git://develop.git.wordpress.org/ $WP_DEVELOP_DIR + # Set up theme information. + - theme_slug=$(basename $(pwd)) + - theme_dir=$WP_DEVELOP_DIR/src/wp-content/themes/$theme_slug + - cd .. + - mv $theme_slug $theme_dir + # Set up WordPress configuration. + - cd $WP_DEVELOP_DIR + - echo $WP_DEVELOP_DIR + - cp wp-tests-config-sample.php wp-tests-config.php + - sed -i "s/youremptytestdbnamehere/wordpress_test/" wp-tests-config.php + - sed -i "s/yourusernamehere/root/" wp-tests-config.php + - sed -i "s/yourpasswordhere//" wp-tests-config.php + # Create WordPress database. + - mysql -e 'CREATE DATABASE wordpress_test;' -uroot + # Install CodeSniffer for WordPress Coding Standards checks. + - git clone https://github.com/squizlabs/PHP_CodeSniffer.git php-codesniffer + # Install WordPress Coding Standards. + - git clone https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git wordpress-coding-standards + # Hop into CodeSniffer directory. + - cd php-codesniffer + # Set install path for WordPress Coding Standards + # @link https://github.com/squizlabs/PHP_CodeSniffer/blob/4237c2fc98cc838730b76ee9cee316f99286a2a7/CodeSniffer.php#L1941 + - scripts/phpcs --config-set installed_paths ../wordpress-coding-standards + # Hop into themes directory. + - cd $theme_dir + # After CodeSniffer install you should refresh your path. + - phpenv rehash + +# Run test script commands. +# Default is specific to project language. +# All commands must exit with code 0 on success. Anything else is considered failure. +script: + # Search for PHP syntax errors. + - find . \( -name '*.php' \) -exec php -lf {} \; + # WordPress Coding Standards + # @link https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards + # @link http://pear.php.net/package/PHP_CodeSniffer/ + # -p flag: Show progress of the run. + # -s flag: Show sniff codes in all reports. + # -v flag: Print verbose output. + # -n flag: Do not print warnings (shortcut for --warning-severity=0) + # --standard: Use WordPress as the standard. + # --extensions: Only sniff PHP files. + # --ignore: Ignore these files/directories + - $WP_DEVELOP_DIR/php-codesniffer/scripts/phpcs -p -s -v -n . --standard=./codesniffer.ruleset.xml --extensions=php --ignore=./bower_components/ + + +# Receive notifications for build results. +# @link http://docs.travis-ci.com/user/notifications/#Email-notifications +notifications: + email: false diff --git a/404.php b/404.php index 0a4cb72a8..0a381bdb7 100644 --- a/404.php +++ b/404.php @@ -5,17 +5,17 @@
id="post-">
-

+

-

+

-

+

    -
  • -
  • home page', 'FoundationPress'), home_url()); ?>
  • -
  • Back button', 'FoundationPress'); ?>
  • +
  • +
  • home page', 'FoundationPress' ), home_url() ); ?>
  • +
  • Back button', 'FoundationPress' ); ?>
diff --git a/archive.php b/archive.php index 3f0deccc0..b501e4de6 100644 --- a/archive.php +++ b/archive.php @@ -16,7 +16,7 @@ - +