Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix/in-querie
Browse files Browse the repository at this point in the history
# Conflicts:
#	classes/class-query.php
  • Loading branch information
kasparsd committed Jul 8, 2020
2 parents 0545f00 + f939e46 commit 89f06a8
Show file tree
Hide file tree
Showing 129 changed files with 14,813 additions and 4,736 deletions.
64 changes: 0 additions & 64 deletions .codeclimate.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
coverage_clover: tests/reports/clover.xml
json_path: tests/reports/coveralls-upload.json
service_name: travis-ci
7 changes: 7 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/ui/lib/
**/*.min.js
/vendor/
/node_modules/
/build/
/local/public/
/dist/
13 changes: 13 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"env": {
"browser": true
},
"extends": [
"plugin:@wordpress/eslint-plugin/es5"
],
"rules": {
"camelcase": "off",
"no-alert": "off",
"vars-on-top": "warn"
}
}
36 changes: 36 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
Delete the section that is not applicable:

# Feature Request

Describe the suggested feature and how it's beneficial to Stream users.


# Bug Report

## Expected Behavior

Describe what should happen.

## Actual Behavior

Describe what actually happens.

## Steps to Reproduce the Problem

1.

2.

3.

## Screenshots

Drag and drop screenshots in this area that help illustrate the problem.

## System Information

- Stream plugin version:
- WordPress version:
- PHP version:
- Browser:
- Computer operating system:
29 changes: 29 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Fixes #000.

Describe your approach and how it fixes the issue.

# Checklist

- [ ] Project documentation has been updated to reflect the changes in this pull request, if applicable.
- [ ] I have tested the changes in the local development environment (see `contributing.md`).
- [ ] I have added phpunit tests.


## Release Changelog

- Fix: Describe a bug fix included in this release.
- New: Describe a new feature in this release.


## Release Checklist

- [ ] This pull request is to the `master` branch.
- [ ] Release version follows [semantic versioning](https://semver.org). Does it include breaking changes?
- [ ] Update changelog in `readme.txt`.
- [ ] Bump version in `stream.php`.
- [ ] Bump `Stable tag` in `readme.txt`.
- [ ] Bump version in `classes/class-plugin.php`.
- [ ] Draft a release [on GitHub](https://github.com/xwp/stream/releases/new).


Change `[ ]` to `[x]` to mark the items as done.
11 changes: 6 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
.DS_Store
/node_modules/
/vendor/
npm-debug.log
package.lock

# Grunt
/build/
/node_modules/
/.vagrant/
/console.log
/phpcs.xml
/stream.zip
/stream-*.zip
npm-debug.log
package.lock

# Compiled files
ui/js/*.min.js
Expand Down
12 changes: 0 additions & 12 deletions .jscsrc

This file was deleted.

4 changes: 0 additions & 4 deletions .jshintignore

This file was deleted.

24 changes: 0 additions & 24 deletions .jshintrc

This file was deleted.

4 changes: 0 additions & 4 deletions .mailmap

This file was deleted.

1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12
91 changes: 47 additions & 44 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,55 @@
language:
- php
- node_js

php:
- 5.6
- 7.0
- 7.2
- 7.3

addons:
apt:
packages:
# For xmllint.
- libxml2-utils
env:
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=1
- WP_VERSION=trunk WP_MULTISITE=0
- WP_VERSION=trunk WP_MULTISITE=1
dist: xenial

language: php

php: "7.4"

jobs:
include:

- stage: test
name: Default Test
after_script:
- test -f ./tests/reports/clover.xml && composer test-report || true

- name: Test with PHP 5.6
env:
WORDPRESS_IMAGE_VERSION: php5.6

- name: Test with PHP 7.2
env:
WORDPRESS_IMAGE_VERSION: php7.2

- stage: deploy
name: Tag Release
if: tag IS present
before_deploy:
- npm run release
deploy:
provider: releases
api_key:
secure: HheYiv6c8ipHzMZBTH7xcKrOwCllvJTtfiTffAPK6XubWe3Kudn6IJUv0p1gmRhWXxZ5ciJQ/sgiCRGTRm/bubHs4tS7JOmpmoTdkrXajTxyyDCKpxhtT43nie0vNF+pWqVu2yOjhDR4pwtWjpQdzEKOz0kn0XSMT+vGsKQD50w=
overwrite: true
skip_cleanup: true
file:
- stream.zip
- stream-$TRAVIS_TAG.zip

services:
- docker

before_install:
- docker-compose pull wordpress
- nvm install
- nvm use

install:
- npm install
- export DEV_LIB_PATH=node_modules/wp-dev-lib/scripts
- source $DEV_LIB_PATH/travis.install.sh

script:
- source $DEV_LIB_PATH/travis.script.sh

after_script:
- source $DEV_LIB_PATH/travis.after_script.sh

before_deploy:
- npm run build

deploy:
provider: releases
overwrite: true
skip_cleanup: true
file_glob: true
file: build/**/*
on:
tags: true

# Pull requests are built by default.
branches:
only:
- master
- develop
- npm run lint
- npm run phpunit
- npm run phpunit-multisite

notifications:
email: false
Expand Down
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"EditorConfig.EditorConfig",
"felixfbecker.php-debug",
"ikappas.phpcs"
]
}
16 changes: 16 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Listen for Stream XDebug",
"type": "php",
"request": "launch",
"port": 9000,
"pathMappings": {
"/var/www/html/wp-content/plugins/stream-src": "${workspaceRoot}",
"/var/www/html/wp-content/plugins/stream": "${workspaceRoot}/build",
"/var/www/html": "${workspaceRoot}/local/public"
}
}
]
}
Loading

0 comments on commit 89f06a8

Please sign in to comment.