Skip to content

Commit 2da5f93

Browse files
ezimuelezimuel
committed
Added code generator + updated endpoints with ES 6.8.14
1 parent d20a5bc commit 2da5f93

File tree

363 files changed

+20055
-8619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+20055
-8619
lines changed

‎composer.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
}
1414
],
1515
"require": {
16-
"php": "^7.1 || ^8.0",
16+
"php": "^7.3 || ^8.0",
1717
"ext-json": ">=1.3.7",
1818
"ezimuel/ringphp": "^1.1.2",
1919
"psr/log": "~1.0"
2020
},
2121
"require-dev": {
22-
"cpliakas/git-wrapper": "~2.0 || ~3.0",
22+
"symplify/git-wrapper": "~9.0",
2323
"doctrine/inflector": "^1.3",
2424
"mockery/mockery": "^1.2",
2525
"phpstan/phpstan": "^0.12",
26-
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.3",
26+
"phpunit/phpunit": "^9.3",
2727
"squizlabs/php_codesniffer": "^3.4",
2828
"symfony/finder": "~4.0",
2929
"symfony/yaml": "~4.0"
@@ -33,14 +33,18 @@
3333
"monolog/monolog": "Allows for client-level logging and tracing"
3434
},
3535
"autoload": {
36+
"files": [
37+
"src/autoload.php"
38+
],
3639
"psr-4": {
3740
"Elasticsearch\\": "src/Elasticsearch/"
3841
}
3942
},
4043
"autoload-dev": {
4144
"psr-4": {
4245
"Elasticsearch\\Tests\\": "tests/Elasticsearch/Tests/",
43-
"Elasticsearch\\IntegrationTests\\": "tests/Elasticsearch/IntegrationTests/"
46+
"Elasticsearch\\IntegrationTests\\": "tests/Elasticsearch/IntegrationTests/",
47+
"Elasticsearch\\Util\\": "util/"
4448
}
4549
},
4650
"config": {

‎phpunit-integration-tests.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
4+
bootstrap="tests/bootstrap.php"
5+
colors="true"
6+
failOnRisky="true"
7+
verbose="true"
8+
beStrictAboutChangesToGlobalState="true"
9+
beStrictAboutOutputDuringTests="true"
10+
beStrictAboutTestsThatDoNotTestAnything="false"
11+
>
12+
<testsuites>
13+
<testsuite name="Integration tests">
14+
<directory>tests</directory>
15+
</testsuite>
16+
</testsuites>
17+
<groups>
18+
<include>
19+
<group>Integration</group>
20+
</include>
21+
</groups>
22+
<filter>
23+
<whitelist>
24+
<directory suffix=".php">src</directory>
25+
</whitelist>
26+
</filter>
27+
</phpunit>

‎phpunit-integration.xml renamed to ‎phpunit-yaml-oss-tests.xml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,29 @@
77
verbose="true"
88
beStrictAboutChangesToGlobalState="true"
99
beStrictAboutOutputDuringTests="true"
10+
beStrictAboutTestsThatDoNotTestAnything="false"
1011
>
1112
<php>
12-
<env name="ES_TEST_HOST" value="http://localhost:9200"/>
13+
<!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
14+
<ini name="error_reporting" value="16383"/>
15+
<ini name="memory_limit" value="-1" />
1316
</php>
1417
<testsuites>
15-
<testsuite name="Integration Tests">
16-
<file>tests/Elasticsearch/Tests/YamlRunnerTest.php</file>
18+
<testsuite name="Yaml tests">
19+
<directory>tests/Elasticsearch/Tests/Yaml/Oss</directory>
1720
</testsuite>
1821
</testsuites>
22+
<groups>
23+
<include>
24+
<group>oss</group>
25+
</include>
26+
</groups>
1927
<filter>
2028
<whitelist>
2129
<directory suffix=".php">src</directory>
2230
</whitelist>
2331
</filter>
32+
<logging>
33+
<log type="junit" target="tests/yaml-test-junit.xml"/>
34+
</logging>
2435
</phpunit>

‎phpunit-yaml-xpack-tests.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
4+
bootstrap="tests/bootstrap.php"
5+
colors="true"
6+
failOnRisky="true"
7+
verbose="true"
8+
beStrictAboutChangesToGlobalState="true"
9+
beStrictAboutOutputDuringTests="true"
10+
beStrictAboutTestsThatDoNotTestAnything="false"
11+
>
12+
<php>
13+
<!-- Disable E_USER_DEPRECATED setting E_ALL & ~E_USER_DEPRECATED-->
14+
<ini name="error_reporting" value="16383"/>
15+
<ini name="memory_limit" value="-1" />
16+
</php>
17+
<testsuites>
18+
<testsuite name="Yaml tests">
19+
<directory>tests/Elasticsearch/Tests/Yaml/Xpack</directory>
20+
</testsuite>
21+
</testsuites>
22+
<groups>
23+
<include>
24+
<group>xpack</group>
25+
</include>
26+
</groups>
27+
<filter>
28+
<whitelist>
29+
<directory suffix=".php">src</directory>
30+
</whitelist>
31+
</filter>
32+
<logging>
33+
<log type="junit" target="tests/yaml-test-junit.xml"/>
34+
</logging>
35+
</phpunit>

‎phpunit.xml.dist

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,21 @@
77
verbose="true"
88
beStrictAboutChangesToGlobalState="true"
99
beStrictAboutOutputDuringTests="true"
10+
beStrictAboutTestsThatDoNotTestAnything="false"
1011
>
11-
<php>
12-
<env name="ES_TEST_HOST" value=""/>
13-
</php>
1412
<testsuites>
15-
<testsuite name="Tests">
13+
<testsuite name="Unit tests">
1614
<directory>tests</directory>
1715
<exclude>tests/Elasticsearch/Tests/YamlRunnerTest.php</exclude>
1816
</testsuite>
1917
</testsuites>
18+
<groups>
19+
<exclude>
20+
<group>Integration</group>
21+
<group>oss</group>
22+
<group>xpack</group>
23+
</exclude>
24+
</groups>
2025
<filter>
2126
<whitelist>
2227
<directory suffix=".php">src</directory>

0 commit comments

Comments
 (0)