Skip to content
This repository has been archived by the owner on Apr 25, 2023. It is now read-only.

Commit

Permalink
Merge 3429baa into 349cfb8
Browse files Browse the repository at this point in the history
  • Loading branch information
sanmai committed Nov 12, 2020
2 parents 349cfb8 + 3429baa commit ef4a06a
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 108 deletions.
2 changes: 1 addition & 1 deletion .phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
// then Phan assumes the PHP version which is closest to the minor version
// of the php executable used to execute phan.
// Automatically inferred from composer.json requirement for "php" of ">=7.0"
'target_php_version' => '7.0',
'target_php_version' => '7.3',

// If enabled, missing properties will be created when
// they are first seen. If false, we'll report an
Expand Down
18 changes: 6 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
sudo: false

language: php
php:
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4
- 8.0snapshot
- nightly
env:
- GROUP=default
Expand All @@ -21,23 +17,21 @@ jobs:
allow_failures:
- php: nightly
- stage: integration
exclude:
- php: 7.3
include:
- stage: integration
php: 7.0
php: 7.3
env:
- GROUP=integration
- CDEK_ACCOUNT=7JM7K5twfzEV1ssCRklthcIPbbVZrZrZ
- CDEK_PASSWORD=t8XBoL1rUofIK9dKoXVB3Tji2F2hPHSk
- stage: integration
php: 7.0
php: 7.3
env:
- GROUP=integration
- CDEK_ACCOUNT=z9GRRu7FxmO53CQ9cFfI6qiy32wpfTkd
- CDEK_PASSWORD=w24JTCv4MnAcuRTx0oHjHLDtyt3I6IBq
- stage: analyze
php: 7.3
php: 7.4
install:
- pecl install ast
- phpenv config-rm xdebug.ini
Expand All @@ -48,7 +42,7 @@ jobs:

cache:
directories:
- $HOME/.composer/cache
- $HOME/.composer
- $HOME/.cache
- build/cache

Expand All @@ -58,7 +52,7 @@ install:
phan/phan phpstan/phpstan vimeo/psalm
infection/infection friendsofphp/php-cs-fixer
- if [[ $TRAVIS_PHP_VERSION = nightly ]]; then export COMPOSER_FLAGS="--ignore-platform-reqs"; fi
- travis_retry composer update --prefer-dist $COMPOSER_FLAGS
- travis_retry composer install --prefer-dist $COMPOSER_FLAGS

script:
- make ci-test --keep-going PHPUNIT_GROUP=$GROUP
Expand Down
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PHPUNIT_ARGS=--coverage-xml=build/logs/coverage-xml --log-junit=build/logs/junit
# Phan
PHAN=vendor/bin/phan
PHAN_ARGS=-j $(JOBS)
PHAN_PHP_VERSION=7.1
PHAN_PHP_VERSION=7.3
export PHAN_DISABLE_XDEBUG_WARN=1

# PHPStan
Expand All @@ -34,7 +34,6 @@ PHPSTAN_ARGS=analyse src tests --level=2 -c .phpstan.neon
# Psalm
PSALM=vendor/bin/psalm
PSALM_ARGS=--show-info=false
PSALM_PHP_VERSION="PHP 7.2"

# Composer
COMPOSER=$(PHP) $(shell which composer)
Expand All @@ -44,7 +43,6 @@ INFECTION=vendor/bin/infection
MIN_MSI=96
MIN_COVERED_MSI=99
INFECTION_ARGS=--min-msi=$(MIN_MSI) --min-covered-msi=$(MIN_COVERED_MSI) --threads=$(JOBS) --coverage=build/logs --log-verbosity=default --show-mutations --no-interaction
INFECTION_PHP_VERSION="PHP 7.2"

all: test

Expand Down Expand Up @@ -148,7 +146,7 @@ report-php-version:
# Quick development testing procedure #
##############################################################

PHP_VERSIONS=php7.0 php7.3
PHP_VERSIONS=php7.3 php7.4

.PHONY: quick
quick:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
```bash
composer require sanmai/cdek-sdk
```
Требования — минимальны. Нужен PHP 7.0 или выше. Работа протестирована под PHP 7.0, 7.1, 7.2, 7.3, 7.4.
Требуется PHP 7.3 или выше. Работа протестирована под PHP 7.3, 7.4.

[Полная документация по всем методам.](https://cdek-sdk.readthedocs.io/)

Expand Down
46 changes: 0 additions & 46 deletions appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
],
"require": {
"php": "^7.0",
"php": "^7.3",
"ext-SimpleXML": "*",
"ext-json": "*",
"ext-libxml": "*",
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
```bash
composer require sanmai/cdek-sdk
```
Требования — минимальны. Нужен PHP 7.0 или выше. Работа протестирована под PHP 7.0, 7.1, 7.2, 7.3, 7.4.
Требуется PHP 7.3 или выше. Работа протестирована под PHP 7.3, 7.4.

### Гарантии обратной совместимости {: #backward-compatibility }

Expand Down
45 changes: 3 additions & 42 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,16 @@
totallyTyped="true"
allowPhpStormGenerics="true"
cacheDirectory="build/"
errorLevel="5"
resolveFromConfigFile="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config file:///home/lesha/workspace/Cdek-SDK/vendor/vimeo/psalm/config.xsd"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
>
<projectFiles>
<directory name="src" />
<directory name="examples" />
<directory name="tests/Integration" />
<ignoreFiles>
<directory name="vendor" />
</ignoreFiles>
</projectFiles>

<issueHandlers>
<LessSpecificReturnType errorLevel="info" />

<!-- level 3 issues - slightly lazy code writing, but provably low false-negatives -->

<DeprecatedMethod errorLevel="info" />
<DeprecatedProperty errorLevel="info" />
<DeprecatedClass errorLevel="info" />
<DeprecatedConstant errorLevel="info" />
<DeprecatedInterface errorLevel="info" />
<DeprecatedTrait errorLevel="info" />

<MissingClosureReturnType errorLevel="info" />
<MissingReturnType errorLevel="info" />
<MissingPropertyType errorLevel="info" />
<InvalidDocblock errorLevel="info" />
<MisplacedRequiredParam errorLevel="info" />

<PropertyNotSetInConstructor errorLevel="info" />
<MissingConstructor errorLevel="info" />
<MissingClosureParamType errorLevel="info" />
<MissingParamType errorLevel="info" />

<RedundantCondition errorLevel="info" />

<DocblockTypeContradiction errorLevel="info" />
<RedundantConditionGivenDocblockType errorLevel="info" />

<UnresolvableInclude errorLevel="info" />

<RawObjectIteration errorLevel="info" />
<ImplementedReturnTypeMismatch errorLevel="info" />

<PossiblyInvalidMethodCall errorLevel="info" />
<PossiblyInvalidArgument errorLevel="info" />

<ReservedWord errorLevel="info" />
</issueHandlers>
</psalm>

0 comments on commit ef4a06a

Please sign in to comment.