v3

.env.example

@@ -1,4 +1,11 @@
 APP_TOKEN=
-SERVICE_PUBLIC_KEY=
-APP_SECRET_KEY=
-UPDATE_TOKEN=
+PUBLIC_KEY=
+SECRET_KEY=
+UPDATE_TOKEN=
+
+// FOR TESTS
+PUBLIC_KEY_NEW=
+SECRET_KEY_NEW=
+DB_HOST=
+DB_LOGIN=
+DB_PASSWORD=

.gitignore

@@ -1,4 +1,8 @@
 .idea
 for-dev
 vendor
-.env
+.env
+composer_dev.json
+composer_dev.lock
+_dev/
+.phpunit.result.cache

.travis.yml

@@ -6,22 +6,17 @@ matrix:
     sudo: required
     dist: xenial
 before_install:
-- openssl aes-256-cbc -K $encrypted_464d35101f45_key -iv $encrypted_464d35101f45_iv -in .env.enc -out .env -d
+- openssl aes-256-cbc -K $encrypted_3c84dcdc6bbe_key -iv $encrypted_3c84dcdc6bbe_iv -in .env.enc -out .env -d
 install:
 - export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 - travis_retry sudo apt-get install software-properties-common
 - travis_retry sudo add-apt-repository -y ppa:ondrej/php
 - travis_retry sudo apt-get update
 - travis_retry sudo apt install -y php7.2 php7.2-dev php7.2-cli
   php7.2-mbstring php7.2-curl php7.2-xml php7.2-intl
-- travis_retry wget https://phar.phpunit.de/phpunit-7.5.1.phar
-- chmod +x phpunit-7.5.1.phar
-- sudo mv phpunit-7.5.1.phar /usr/bin/phpunit
 - curl -sS https://getcomposer.org/installer -o composer-setup.php
 - sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer
 before_script:
-- sudo cp $TRAVIS_BUILD_DIR/_travis/vsce_phe_php.so /usr/lib/php/20170718
-- sudo sh -c "echo 'extension=vsce_phe_php.so' >> /etc/php/7.2/cli/php.ini"
 - composer install
-script: phpunit --configuration phpunit.xml
-
+- sh $TRAVIS_BUILD_DIR/vendor/virgil/crypto-wrapper/_extensions/setup.sh -all -vendor
+script: vendor/bin/phpunit --configuration phpunit.xml

LICENSE

@@ -1,29 +1,33 @@
-BSD 3-Clause License
+Copyright (C) 2015-2020 Virgil Security Inc.
 
-Copyright (c) 2019, Passw0rd
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are
+met:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+    (1) Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+    (2) Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
 
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+    (3) Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+Lead Maintainer: Virgil Security Inc. <support@virgilsecurity.com>