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

PHP-tests fixes #285

Merged
merged 37 commits into from
Jan 25, 2018
Merged

PHP-tests fixes #285

merged 37 commits into from
Jan 25, 2018

Commits on Jan 18, 2018

  1. php tests with composer setup

    @mozhmike
    mozhmike committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    bb43348 View commit details
    Browse the repository at this point in the history

  2. php tests fix

    @mozhmike
    mozhmike committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    b7700dc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/cossacklabs/themis into p… 

    …hp-tests

Conflicts:
	tests/phpthemis/composer-php5.6.json
	tests/phpthemis/composer-php7.json
	tests/phpthemis/composer-setup.sh
	tests/phpthemis/init_env-php5.6.sh
	tests/phpthemis/init_env-php7.sh
	tests/phpthemis/run_tests.sh
	tests/phpthemis/scell_test.php
    @mozhmike
    mozhmike committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    2b9cf5b View commit details
    Browse the repository at this point in the history

  4. fix tests

    @Lagovas
    Lagovas committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    cb9c8ce View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2018

  1. Force env init before tests

    @mozhmike
    mozhmike committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    9d00125 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'php-tests' of https://github.com/cossacklabs/themis int… 

    …o php-tests
    @mozhmike
    mozhmike committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    51afdd0 View commit details
    Browse the repository at this point in the history

  3. fix session in extension

    @Lagovas
    Lagovas committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    7cf5e2e View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/php-tests' into php-tests

    @Lagovas
    Lagovas committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    0ba9d86 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into php-tests

    @Lagovas
    Lagovas committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    42dd7cb View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin' into php-tests

    Mike Mozharovsky committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    7207acd View commit details
    Browse the repository at this point in the history

  7. Makefiles for php-tests

    @mozhmike
    mozhmike committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    6ed02f5 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'php-tests' of https://github.com/cossacklabs/themis int… 

    …o php-tests
    Mike Mozharovsky committed Jan 19, 2018
    Configuration menu
    Copy the full SHA
    e9f9176 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. Merge branch 'master' into php-tests

    @mozhmike
    mozhmike committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    9b14dab View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into php-tests

    @Lagovas
    Lagovas committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    e282d00 View commit details
    Browse the repository at this point in the history

  3. small readme fix

    @vixentael
    vixentael committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    7ec9f07 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. Makefiles for php-tests

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    45cd178 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'php-tests' of https://github.com/cossacklabs/themis int… 

    …o php-tests
    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    076aef3 View commit details
    Browse the repository at this point in the history

  3. apt-get php5-dev

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    1c4b1cf View commit details
    Browse the repository at this point in the history

  4. Circle-ci php env

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    bbec1ef View commit details
    Browse the repository at this point in the history

  5. Circle-ci php env

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    537c97d View commit details
    Browse the repository at this point in the history

  6. merge

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    f2a2324 View commit details
    Browse the repository at this point in the history

  7. Make for php-tests

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    40a4826 View commit details
    Browse the repository at this point in the history

  8. Make for php-tests

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    2d3d76d View commit details
    Browse the repository at this point in the history

  9. Circle-ci config for phpize link

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    7f9c5f6 View commit details
    Browse the repository at this point in the history

  10. Circle-ci config for php-config link

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    1c10c0a View commit details
    Browse the repository at this point in the history

  11. fix for php test

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    bb3e144 View commit details
    Browse the repository at this point in the history

  12. Circle build setting push

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    d1c6e25 View commit details
    Browse the repository at this point in the history

  13. Isolate python test

    @mozhmike
    mozhmike committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    0b10bf6 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Revert python test isolation

    @mozhmike
    mozhmike committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    cb6b509 View commit details
    Browse the repository at this point in the history

  2. explicitly use python2 

    temporarily comment coverage calculation
    @Lagovas
    Lagovas committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    f496659 View commit details
    Browse the repository at this point in the history

  3. force rebuild

    @Lagovas
    Lagovas committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    fa3d5d6 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2018

  1. fix setuptools error

    @Lagovas
    Lagovas committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    1a09908 View commit details
    Browse the repository at this point in the history

  2. fix editor newline

    @Lagovas
    Lagovas committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    ca80c66 View commit details
    Browse the repository at this point in the history

  3. fix gcov usage

    @Lagovas
    Lagovas committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    e4c43a1 View commit details
    Browse the repository at this point in the history

  4. setup python3 version

    @Lagovas
    Lagovas committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    26edb33 View commit details
    Browse the repository at this point in the history

  5. force rebuild

    @Lagovas
    Lagovas committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    ff6ef8c View commit details
    Browse the repository at this point in the history

  6. fix installing python

    @Lagovas
    Lagovas committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    5627816 View commit details
    Browse the repository at this point in the history