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.

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

6) Update ci and cs #71

Merged
merged 63 commits into from
Nov 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
e3a4bf9
fix the build
pivnicek Sep 25, 2018
bd691dc
update to db-extractor-common 5.3.2
pivnicek Sep 25, 2018
66ac455
tests for json config support
pivnicek Sep 26, 2018
ae7ed77
ignore temp json configurations
pivnicek Sep 26, 2018
30bcc55
Support json configurations
pivnicek Sep 26, 2018
4d98fee
fix getTables run test
pivnicek Sep 26, 2018
4babb76
use exception handling as in php-component
pivnicek Sep 26, 2018
c064ff2
update to common 9.1.*
pivnicek Sep 26, 2018
704d0d2
replace bootstrap with autoload
pivnicek Sep 26, 2018
520efab
update application constructor
pivnicek Sep 26, 2018
c41c038
use correct datadir and app construct
pivnicek Sep 26, 2018
8249b18
update method signatures
pivnicek Sep 27, 2018
a155f1f
update to expected sigs and outputs
pivnicek Sep 27, 2018
f87fefd
update tests to expected sigs and outputs
pivnicek Sep 27, 2018
5e0e5db
add stan and cs
pivnicek Sep 27, 2018
dc47936
use composer ci as command
pivnicek Sep 27, 2018
5b98c9c
add keboola cs
pivnicek Sep 27, 2018
2580578
phpcbf auto corrections
pivnicek Sep 27, 2018
05e50a2
phpcbf auto fixes part II
pivnicek Sep 27, 2018
9918927
turn off formatting for config definition
pivnicek Sep 27, 2018
88ad336
fix type declarations
pivnicek Sep 27, 2018
991ca7f
cs updates
pivnicek Oct 1, 2018
4a0c1b2
stan fixes
pivnicek Oct 1, 2018
bd13363
stan fixes
pivnicek Oct 3, 2018
ec626bf
ini-set param type fix
pivnicek Oct 3, 2018
0ad1b43
use composer ci from travis
pivnicek Oct 3, 2018
7d50d1d
rollback phpunit and phpstan"
pivnicek Oct 10, 2018
2a6fa1f
remove deprecated constants
pivnicek Oct 10, 2018
1174638
wip: trying to fix phpstan recursion error
pivnicek Oct 10, 2018
833ef18
remove deprecated const reference
pivnicek Oct 10, 2018
f1b2eef
use stan-shim 0.10
pivnicek Oct 11, 2018
540437c
stan fixes
pivnicek Oct 11, 2018
37611f1
add phpstan.neon
pivnicek Oct 16, 2018
1ba870a
strict type casting for row count
pivnicek Oct 26, 2018
47ab800
fix datadir location
pivnicek Oct 26, 2018
8bfe9ec
remove timeout on composer processes
pivnicek Oct 29, 2018
61bfa60
fix dataPaths for run tests
pivnicek Oct 29, 2018
a6eb0e3
fix dirs for dir cleanup
pivnicek Oct 29, 2018
67c139e
add dir cleaning for getTables and json files
pivnicek Oct 29, 2018
8c47742
fix indentation
pivnicek Oct 30, 2018
8751ba9
improve error message
pivnicek Oct 30, 2018
cf59ee6
add typehinting to closures
pivnicek Oct 30, 2018
b09fe65
write manifest as json
pivnicek Oct 30, 2018
8670748
remove unnecessary method doc comments
pivnicek Oct 30, 2018
973a601
remove unused uses
pivnicek Nov 7, 2018
ea85899
debug tests
pivnicek Nov 7, 2018
3a60372
fix doc spacing
pivnicek Nov 7, 2018
cd858c2
fix typo in method name
pivnicek Nov 7, 2018
b350ab4
use quote method
pivnicek Nov 7, 2018
7e776f6
remove useless diffs
pivnicek Nov 7, 2018
e46972d
improve conditional aesthetics
pivnicek Nov 7, 2018
b7155dd
move tests to top-level tests directory
pivnicek Nov 7, 2018
7ea2ff4
revert aesthetic conditional, sniff doesn't like it
pivnicek Nov 7, 2018
a0cbdca
Fix long conditional
tomasfejfar Nov 8, 2018
56b21b7
Revert useless diffs
tomasfejfar Nov 8, 2018
40330dd
fixup! Revert useless diffs
tomasfejfar Nov 8, 2018
c711c84
fixup! Revert useless diffs
tomasfejfar Nov 8, 2018
62a171f
fixup! Revert useless diffs
tomasfejfar Nov 8, 2018
09d1203
fixup! Revert useless diffs
tomasfejfar Nov 8, 2018
b80dfa6
fixup! Revert useless diffs
tomasfejfar Nov 8, 2018
ff8ca40
fixup! Revert useless diffs
tomasfejfar Nov 8, 2018
9c73355
reformat SQL
tomasfejfar Nov 8, 2018
dec8f9f
get rid of debug dumps
pivnicek Nov 8, 2018
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@ test.php
tests/data/config.yml
tests/data/out/
tests/data/connectionAction/config.yml
tests/data/connectionAction/config.json
tests/data/connectionAction/out/
tests/data/runAction/config.yml
tests/data/runAction/config.json
tests/data/runAction/out/
tests/data/getTablesAction/config.yml
tests/data/getTablesAction/config.json
tests/data/getTablesAction/out/
snowflake_linux_x8664_odbc.tgz
snowsql-linux_x86_64.bash
snowflake-odbc-x86_64.deb
Expand Down
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ install:
- docker-compose run --rm drivers-download composer install
- docker-compose run --rm drivers-download php driver/downloadDriver.php
- docker-compose build app
- docker-compose run --rm app vendor/bin/phpcs --standard=psr2 --ignore=vendor -n .
- docker-compose run --rm app vendor/bin/phpunit
- docker-compose run --rm app
tomasfejfar marked this conversation as resolved.
Show resolved Hide resolved

script:
- docker pull quay.io/keboola/developer-portal-cli-v2:latest
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
FROM php:7.1
MAINTAINER Erik Zigo <[email protected]>

ENV COMPOSER_ALLOW_SUPERUSER=1
ENV DEBIAN_FRONTEND noninteractive

# Install Dependencies
RUN apt-get update \
&& apt-get install unzip git unixODBC-dev libpq-dev -y
&& apt-get install unzip git unixodbc unixodbc-dev libpq-dev -y

RUN docker-php-ext-install pdo_pgsql pdo_mysql
RUN pecl install xdebug \
Expand Down
38 changes: 28 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,22 @@
"keywords": ["keboola", "snowflake", "db", "extractor"],
"authors": [
{
"name": "Erik Žigo",
"email": "erik@keboola.com"
"name": "Keboola",
"email": "devel@keboola.com"
}
],
"require": {
"php": ">=5.6",
"keboola/db-extractor-common": "~5.2",
"keboola/php-temp": "^0.1.6",
"keboola/php-csv-db-import": "~2.3.0",
"squizlabs/php_codesniffer": "^2.6",
"vkartaviy/retry": "^0.2"
"php": ">=7.1",
"keboola/db-extractor-common": "~9.1",
"keboola/php-temp": "^1.0",
"keboola/php-csv-db-import": "~2.3.0"
},
"require-dev": {
"phpunit/phpunit": "4.6.*",
"codeclimate/php-test-reporter": "^0.3",
"keboola/coding-standard": "^6.0",
"keboola/storage-api-client": "^4.14",
"keboola/php-csv-db-import": "~2.3.0"
"phpstan/phpstan-shim": "^0.10"
},
"autoload": {
"psr-4": {
Expand All @@ -31,7 +30,26 @@
},
"autoload-dev": {
"psr-4": {
"Keboola\\Test\\": "tests/"
"Keboola\\DbExtractor\\Tests\\": "tests/"
}
},
"scripts": {
"tests": "phpunit",
"phpstan": "phpstan analyse --no-progress --level=max -c phpstan.neon ./src ./tests",
"phpcs": "phpcs -n --ignore=vendor --extensions=php .",
"phpcbf": "phpcbf -n --ignore=vendor --extensions=php .",
"build": [
"@phpcs",
"@phpstan",
"@tests"
],
"ci": [
"@composer validate --no-check-all --strict",
"@build"
]
},
"config": {
"process-timeout": 0,
"sort-packages": true
}
}
Loading