Skip to content

Commit

Permalink
Merge 9a04aa1 into 97e750a
Browse files Browse the repository at this point in the history
  • Loading branch information
CyberiaResurrection committed Aug 1, 2020
2 parents 97e750a + 9a04aa1 commit 4562f35
Show file tree
Hide file tree
Showing 1,531 changed files with 52,105 additions and 164,745 deletions.
34 changes: 28 additions & 6 deletions .scrutinizer.yml
Expand Up @@ -74,7 +74,7 @@ checks:
newline_at_end_of_file: true
naming_conventions:
local_variable: '^[a-z][a-zA-Z0-9]*$'
abstract_class_name: ^Abstract|Factory$
abstract_class_name: ^Abstract|Factory$|Base$
utility_class_name: 'Utils?$'
constant_name: '^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$'
property_name: '^[a-z][a-zA-Z0-9]*$'
Expand All @@ -83,7 +83,7 @@ checks:
interface_name: '^[A-Z][a-zA-Z0-9]*Interface$'
type_name: '^[A-Z][a-zA-Z0-9]*$'
exception_name: '^[A-Z][a-zA-Z0-9]*Exception$'
isser_method_name: '^(?:is|has|should|may|supports)'
isser_method_name: '^(?:is|has|should|may|supports|get|set)'
more_specific_types_in_doc_comments: true
missing_arguments: true
method_calls_on_non_object: true
Expand Down Expand Up @@ -130,6 +130,8 @@ checks:
avoid_aliased_php_functions: true
assignment_of_null_return: true
argument_type_checks: true
excluded_dependencies:
- satooshi/php-coveralls

coding_style:
php:
Expand Down Expand Up @@ -160,7 +162,25 @@ coding_style:
general: lower
constants:
true_false_null: lower
filter:
paths:
- src/

dependency_paths:
- vednor/

excluded_paths:
- src/MetadataV3/Edm/Concerns/Expression/HasValueTermReferenceExpression.php
- src/MetadataV3/Edm/Concerns/Expression/HasAnonymousFunctionExpression.php
- src/MetadataV3/Edm/Concerns/Expression/HasApplyExpression.php
- src/MetadataV3/Edm/Concerns/Expression/HasCollectionExpression.php
- src/MetadataV3/Edm/Concerns/Expression/HasFunctionReference.php
- src/MetadataV3/Edm/Concerns/Expression/HasIfExpression.php
- src/MetadataV3/Edm/Concerns/Expression/HasParameterReferenceExpression.php
- src/Edm/Concerns/Expression/HasPropertyReferenceExpression.php
- src/MetadataV3/Edm/Concerns/Expression/HasRecordExpression.php
- src/MetadataV3/Edm/Concerns/Expression/HasTypeAssertExpression.php
- src/MetadataV3/Edm/Concerns/Expression/HasTypeTestExpression.php
tools:
php_cs_fixer:
config:
Expand All @@ -175,10 +195,12 @@ tools:
php_changetracking: true

build_failure_conditions:
- 'elements.rating(<= F).new.exists'
- 'elements.rating(<= D).new.exists'
- 'issues.severity(>= CRITICAL).new.exists'

build:
dependencies:
before:
- composer remove --dev pcov/clobber --no-update
nodes:
analysis:
tests:
override:
- php-scrutinizer-run
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -12,6 +12,7 @@ before_script:
- pecl install pcov
- phpenv config-rm xdebug.ini
- composer global require hirak/prestissimo
- composer require pcov/clobber
- composer config minimum-stability ${STABILITY}
- COMPOSER_MEMORY_LIMIT=-1 composer install
- vendor/bin/pcov clobber
Expand All @@ -34,7 +35,6 @@ env: # important!
matrix:
allow_failures:
- php: nightly
- php: 7.4

#notifications:
# webhooks:
Expand Down
21 changes: 12 additions & 9 deletions composer.json
Expand Up @@ -25,16 +25,18 @@
],
"require": {
"php": "^7.1",
"doctrine/inflector": ">=1.1",
"jms/serializer": "^3.0|^2.0|^1.7"
"myclabs/php-enum": "dev-master",
"ext-xmlwriter": "*",
"ext-xmlreader": "*"
},
"require-dev": {
"mockery/mockery": "^1.2|dev-master",
"php-coveralls/php-coveralls": ">=v2.1",
"phpspec/phpspec": "^3.0",
"squizlabs/php_codesniffer": "~2.3",
"mockery/mockery": "0.9.*|^1.0@dev",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^7.0",
"php-coveralls/php-coveralls": ">=v2.1",
"pcov/clobber": "dev-master"
"squizlabs/php_codesniffer": "~2.3",
"symfony/var-dumper": ">=4.0.0"
},
"scripts": {
"test": "phpunit",
Expand All @@ -44,12 +46,13 @@
"psr-4": {
"AlgoWeb\\ODataMetadata\\": "src/"
},
"files": ["src/polyfill.php"]

},
"autoload-dev": {
"classmap": [
"tests/"
]
},
"autoload-dev": {

},
"config": {
"sort-packages": true
Expand Down
65 changes: 65 additions & 0 deletions composer.json.bak
@@ -0,0 +1,65 @@
{
"name": "algo-web/o-data-metadata",
"type": "library",
"keywords": [
"OData",
"metadata",
"POData"
],
"homepage": "https://github.com/Algo-Web/ODataMetadata",
"license": "MIT",
"authors": [
{
"name": "Alex Goodwin",
"email": "cyberia.resurrection@gmail.com",
"homepage": "http://www.example.org",
"role": "Developer"
},
{
"name": "Chris Harris",
"email": "c.harris@communicationinnovations.com.au",
"homepage": "http://www.example.org",
"role": "Developer"
}
],
"repositories": [
{
"type": "vcs",
"url": "https://github.com/Algo-Web/serializer.git",
"no-api": true
}
],
"require": {
"php": "~5.6|^7.0",
"illuminate/support": "^4.0|^5.1|^6.0",
"jms/serializer": "^1.7"
},
"require-dev": {
"brianium/paratest": "0.15.*",
"phpspec/phpspec": "^3.0",
"squizlabs/php_codesniffer": "~2.3",
"fiunchinho/phpunit-randomizer": "2.0.*",
"mockery/mockery": "0.9.*|^1.0@dev",
"phpunit/phpunit": "^5.6",
"php-coveralls/php-coveralls": "dev-master"
},
"scripts": {
"test": "phpunit",
"format": "phpcbf --standard=psr2 src/"
},
"autoload": {
"psr-4": {
"AlgoWeb\\ODataMetadata\\": "src/"
},
"classmap": [
"tests/"
]
},
"autoload-dev": {

},
"config": {
"sort-packages": true
},
"minimum-stability": "dev"
}

0 comments on commit 4562f35

Please sign in to comment.