Skip to content

Commit

Permalink
Merge branch '2.0.0-dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
irfan-dahir committed Aug 5, 2018
2 parents e84cb5d + 05f0577 commit 80978d0
Show file tree
Hide file tree
Showing 301 changed files with 22,812 additions and 5,265 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
/vendor/
/.idea/
/.idea/
/composer.lock
/test.php
/jikan-fixtures
33 changes: 27 additions & 6 deletions .travis.yml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
language: php

php:
- '7.0'
- '7.1'
- '7.2'
- 7.1
- 7.2
- nightly

env:
matrix:
-
# - DEPENDENCIES=--prefer-lowest

cache:
directories:
- .composer/cache

matrix:
fast_finish: true
allow_failures:
- php: nightly

before_install:
- alias composer=composer\ --no-interaction && composer selfupdate
- composer global require hirak/prestissimo

install:
- travis_retry composer update --no-progress --profile --no-scripts --no-suggest $DEPENDENCIES

before_script:
- composer install
script: php travis.php
script:
- vendor/bin/grumphp run
51 changes: 51 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
build: false
shallow_clone: false
platform:
- x86
- x64
clone_folder: c:\projects\jikan

environment:
matrix:
- PHP_VERSION: 7.1
- PHP_VERSION: 7.2

cache:
- '%APPDATA%\Composer'
- c:\tools\php -> appveyor.yml
init:
- SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
- SET COMPOSER_NO_INTERACTION=1
- SET PHP=1
- SET ANSICON=121x90 (121x90)

install:
- IF EXIST c:\tools\php (SET PHP=0)
- ps: Set-Service wuauserv -StartupType Manual

# Install PHP here
- ps: appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:PHP_VERSION | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
# - IF %PHP%==1 cinst -y OpenSSL.Light
# - IF %PHP%==1 cinst -y php -version %PHP_VERSION%
# - cd C:\tools\php71
- cd c:\tools\php
- IF %PHP%==1 copy php.ini-production php.ini
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
- IF %PHP%==1 echo memory_limit=1024M >> php.ini
- IF %PHP%==1 echo extension_dir=ext >> php.ini
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini
- IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat

# Download
- cd C:\tools
- appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar

before_test:
- cd C:\projects\jikan
- php C:\tools\composer.phar update --no-progress --profile --prefer-dist --no-scripts --no-interaction --no-suggest

test_script:
- cd c:\projects\jikan
- vendor\bin\phpunit --colors=always
22 changes: 20 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,33 @@
"email": "[email protected]"
}
],
"minimum-stability": "dev",
"require": {},
"minimum-stability": "stable",
"autoload": {
"psr-4": {
"Jikan\\": [
"src"
]
}
},
"autoload-dev": {
"psr-4": {
"Jikan\\": [
"test/JikanTest"
]
}
},
"require": {
"fabpot/goutte": "^3.2",
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "^6.3",
"php-vcr/php-vcr": "~1.3.2",
"php-vcr/phpunit-testlistener-vcr": "^3.0",
"squizlabs/php_codesniffer": "^3.3",
"phpro/grumphp": "^0.14.1",
"jakub-onderka/php-parallel-lint": "^1.0",
"doctrine/collections": "^1.5",
"jikan-me/jikan-fixtures": "dev-master"
}
}
12 changes: 0 additions & 12 deletions examples/anime.php

This file was deleted.

9 changes: 0 additions & 9 deletions examples/character.php

This file was deleted.

11 changes: 0 additions & 11 deletions examples/manga.php

This file was deleted.

9 changes: 0 additions & 9 deletions examples/person.php

This file was deleted.

15 changes: 0 additions & 15 deletions examples/schedule.php

This file was deleted.

110 changes: 0 additions & 110 deletions examples/search.php

This file was deleted.

13 changes: 0 additions & 13 deletions examples/seasonal.php

This file was deleted.

43 changes: 0 additions & 43 deletions examples/test.php

This file was deleted.

20 changes: 20 additions & 0 deletions grumphp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
parameters:
git_dir: .
bin_dir: ./vendor/bin
process_timeout: 180
tasks:
phpcs:
standard: 'PSR2'
ignore_patterns:
- 'test/*.php'
- 'src/Jikan.php'
git_blacklist:
keywords:
- 'var_dump'
- 'exit'
- 'else'
- 'ini_set'
- 'error_reporting'
- 'die'
phpunit: ~
phplint: ~
Loading

0 comments on commit 80978d0

Please sign in to comment.