Skip to content
This repository has been archived by the owner on Jan 15, 2019. It is now read-only.

Commit

Permalink
Merge pull request #7 from WordPress/master
Browse files Browse the repository at this point in the history
merge master back in fork
  • Loading branch information
fabiankaegy authored Oct 19, 2018
2 parents 418e655 + b638bef commit f254535
Show file tree
Hide file tree
Showing 38 changed files with 741 additions and 348 deletions.
21 changes: 21 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This file is for unifying the coding style for different editors and IDEs
# editorconfig.org

# WordPress Coding Standards
# https://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

[{package.json,*.yml}]
indent_style = space
indent_size = 2

[{*.txt,wp-config-sample.php}]
end_of_line = crlf
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Files to exclude when creating archive.

*.git export-ignore
*.gitignore export-ignore
*.gitattributes export-ignore
.travis.yml export-ignore
CONTRIBUTING.md export-ignore
CONTRIBUTORS.md export-ignore
phpcs.xml.dist export-ignore
99 changes: 99 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
# Travis CI configuration file.
# @link https://travis-ci.org/

# For use with the Twenty Nineteen WordPress theme
# @link https://github.com/WordPress/twentynineteen/

# Declare project language and PHP versions to test against.
# @link http://about.travis-ci.org/docs/user/languages/php/
language: php

# Newer versions like trusty don't have PHP 5.2 or 5.3
# https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming
dist: precise

# Declare versions of PHP to use. Use one decimal max.
php:
- "7.3"
- "7.2"
- "7.1"
- "7.0"
- "5.6"
- "5.5"
- "5.4"
- "5.3"
# Current $required_php_version for WordPress: 5.2.4
- "5.2"

# Ditch sudo and use containers.
# @link http://docs.travis-ci.com/user/migrating-from-legacy/#Why-migrate-to-container-based-infrastructure%3F
# @link http://docs.travis-ci.com/user/workers/container-based-infrastructure/#Routing-your-build-to-container-based-infrastructure
sudo: false

# Declare which versions of WordPress to test against.
# Also declare whether or not to test in Multisite.
env:
# Current version in development is 5.0.
# @link https://github.com/WordPress/WordPress
- WP_VERSION=5.0 WP_MULTISITE=0

# 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 Twenty Nineteen 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
- |
if [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]] && [[ ${TRAVIS_PHP_VERSION:0:3} != "5.3" ]]; then
# Install CodeSniffer for WordPress Coding Standards checks.
wget https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
# Install WordPress Coding Standards.
mkdir wordpress-coding-standards && curl -L https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/archive/master.tar.gz | tar xz --strip-components=1 -C wordpress-coding-standards
# Set install path for WordPress Coding Standards
# @link https://github.com/squizlabs/PHP_CodeSniffer/blob/4237c2fc98cc838730b76ee9cee316f99286a2a7/CodeSniffer.php#L1941
php phpcs.phar --config-set installed_paths $(pwd)/wordpress-coding-standards
fi
# Hop into themes directory.
- cd $theme_dir
# After CodeSniffer install you should refresh your path.
- phpenv rehash
# Install JSHint, a JavaScript Code Quality Tool
# @link http://jshint.com/docs/
- npm install -g jshint
- wget https://develop.svn.wordpress.org/trunk/.jshintrc

# 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 theme for PHP syntax errors.
- find . \( -name '*.php' \) -exec php -lf {} \;
# Run the theme through JSHint
- jshint .
# 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.
- if [ -e $WP_DEVELOP_DIR/phpcs.phar ]; then php $WP_DEVELOP_DIR/phpcs.phar -p -s -v -n . --extensions=php; fi
5 changes: 4 additions & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ Version 1.0:
@yingling017
@mrasharirfan
@milana_cap
@fabiankaegy
@fabiankaegy
@westonruter
@aaronjorbin
@netweb
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Twenty Nineteen

[![Build Status](https://travis-ci.org/WordPress/twentynineteen.svg?branch=master)](https://travis-ci.org/WordPress/twentynineteen)

**Contributors:** the WordPress team
**Requires at least:** WordPress 4.9.8
**Tested up to:** WordPress 4.9.8
Expand Down
6 changes: 3 additions & 3 deletions archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
* @subpackage Twenty_Nineteen
*/

get_header();
get_header();
?>

<div id="primary" class="content-area">
<main id="main" class="site-main" role="main">
<main id="main" class="site-main">

<?php if ( have_posts() ) : ?>

Expand Down Expand Up @@ -51,5 +51,5 @@
</main><!-- .site-main -->
</div><!-- .content-area -->

<?php
<?php
get_footer();
Loading

0 comments on commit f254535

Please sign in to comment.