Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update symplify/coding-standard requirement from ^0.1 to ^0.1 || ^1.0 #2

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Update symplify/coding-standard requirement from ^0.1 to ^0.1 || ^1.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
50b926d
bugfix - return of town
petrparolek Mar 19, 2017
446cab2
bugfix - better return of town and district
petrparolek Mar 23, 2017
39064cd
bugfix - better return of town and district
petrparolek Mar 23, 2017
04d95c3
- tray to fix tests for all version of PHP
petrparolek Mar 23, 2017
9f6f466
tray to fix tests for all version of PHP
petrparolek Mar 23, 2017
beb59df
tray to fix tests for all version of PHP
petrparolek Mar 23, 2017
8ea876a
tray to fix tests for all version of PHP
petrparolek Mar 23, 2017
f74ffdf
Revert to sys_get_tmp_dir()
dfridrich Apr 6, 2017
20815fa
Fix a typo
dfridrich Apr 6, 2017
feaf559
Update symplify/coding-standard requirement from ^0.1 to ^0.1 || ^1.0
dependabot-preview[bot] Jul 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,26 @@ php:
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm

#matrix:
# allow_failures:
# - php: 7.0
# - php: hhvm
# include:
# - php: 7.0
# env: PHPUNIT_FLAGS="--coverage-clover coverage.clover" CHECK_CS=true
matrix:
allow_failures:
- php: 7.0
- php: 7.1
- php: hhvm
include:
- php: 7.0
- php: 7.1
env: PHPUNIT_FLAGS="--coverage-clover coverage.clover" CHECK_CS=true

before_script:
- composer self-update
- composer install --no-interaction --prefer-source

#script:
# - phpunit $PHPUNIT_FLAGS
# - if [[ "$CHECK_CS" != "" ]]; then vendor/bin/symplify-cs check src tests; fi
script:
- phpunit $PHPUNIT_FLAGS
- if [[ "$CHECK_CS" != "" ]]; then vendor/bin/symplify-cs check src tests; fi

#after_script:
# - if [[ "$PHPUNIT_FLAGS" != "" ]]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
after_script:
- if [[ "$PHPUNIT_FLAGS" != "" ]]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"fabpot/goutte": "^2.0|^3.0"
},
"require-dev": {
"symplify/coding-standard": "^0.1"
"symplify/coding-standard": "^0.1 || ^1.0"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 5 additions & 3 deletions src/Ares.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,11 @@ public function findByIdentificationNumber($id)
} else {
$record->setStreetHouseNumber(strval($elements->AA->CD));
}

if (strval($elements->AA->NCO)) {
$record->setTown(strval($elements->AA->N.' - '.strval($elements->AA->NCO)));

if (strval($elements->AA->N) == "Praha") { //Praha
$record->setTown(strval($elements->AA->NMC) ." - ". strval($elements->AA->NCO));
} elseif(strval($elements->AA->NCO) != strval($elements->AA->N)) { //Ostrava
$record->setTown(strval($elements->AA->N) ." - ". strval($elements->AA->NCO));
} else {
$record->setTown(strval($elements->AA->N));
}
Expand Down