Skip to content

Commit

Permalink
added index and license, fixed windows space issue, cahnged version
Browse files Browse the repository at this point in the history
  • Loading branch information
Marius Gudauskis committed May 18, 2020
1 parent 862edb6 commit d396405
Show file tree
Hide file tree
Showing 1,733 changed files with 147,965 additions and 143,349 deletions.
26 changes: 13 additions & 13 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
### Expected behavior
<!-- Describe the expected behavior here -->

### Actual behavior
<!-- Describe the actual behavior here -->

### Steps to reproduce the behavior
<!-- Describe the steps to reproduce the behavior here -->

### Environment
* PrestaShop version: 1.7.5.0 <!-- replace this with the full version you are using -->
* Mollie module version: 3.3.4 <!-- replace this with the full version you are using -->
* PHP version: 7.1.26 <!-- replace this with the full version you are using -->
### Expected behavior
<!-- Describe the expected behavior here -->

### Actual behavior
<!-- Describe the actual behavior here -->

### Steps to reproduce the behavior
<!-- Describe the steps to reproduce the behavior here -->

### Environment
* PrestaShop version: 1.7.5.0 <!-- replace this with the full version you are using -->
* Mollie module version: 3.3.4 <!-- replace this with the full version you are using -->
* PHP version: 7.1.26 <!-- replace this with the full version you are using -->
22 changes: 11 additions & 11 deletions .github/index.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');

header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');

header('Location: ../');
exit;
<?php

header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');

header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');

header('Location: ../');
exit;
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
*mollie*.zip
composer.lock
yarn.lock
yarn-error.log
package-lock.json
.idea/
build/
prestashop/
.codecept.phar
/translations/
*mollie*.zip
composer.lock
yarn.lock
yarn-error.log
package-lock.json
.idea/
build/
prestashop/
.codecept.phar
/translations/
var/
210 changes: 105 additions & 105 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,105 +1,105 @@
language: php
dist: xenial
node_js:
- 10
sudo: true
services:
- docker
addons:
chrome: stable

env:
global:
- COMPOSER_NO_INTERACTION=1
- PRESTASHOP_PORT=8090

cache:
- yarn
- npm
- directories:
- "$HOME/.composer/cache"
- node_modules

matrix:
fast_finish: true
include:
- php: 5.3
dist: precise
env: TEST_SYNTAX=true SKIP_NODE=true
- php: 5.4
dist: precise
env: TEST_SYNTAX=true SKIP_NODE=true
- php: 5.5
dist: precise
env: TEST_SYNTAX=true SKIP_NODE=true
- php: 5.6
env: TEST_SYNTAX=true
- php: 7.0
env: TEST_SYNTAX=true
- php: 7.1
env: TEST_SYNTAX=true
- php: 7.2
env: TEST_SYNTAX=true
- php: 7.3
env: TEST_SYNTAX=true
- php: 7.1
env: TEST_UNIT=true
- php: 7.1
env: TEST_FRONTEND=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.5.4.2" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.5.6.2" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.6.0.5" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.6.1.23" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.7.3.4" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.7.4.4" TEST_ACCEPTANCE=true
- php: 7.1
env: PRESTASHOP_VERSION="1.7.5.0" TEST_ACCEPTANCE=true

before_install:
- >
if [[ "${SKIP_NODE}" != "true" ]]; then
curl -o- -L https://yarnpkg.com/install.sh | bash
export PATH="$HOME/.yarn/bin:$PATH"
fi
before_script:
# Build the release
- >
if [[ "${TEST_UNIT}" = "true" ]] || [[ "${TEST_ACCEPTANCE}" = "true" ]]; then
export MOLLIE_MODULE_VERSION=$(sed -ne "s/\\\$this->version *= *['\"]\([^'\"]*\)['\"] *;.*/\1/p" mollie.php | awk '{$1=$1};1')
make r
cp ./build/mollie-v${MOLLIE_MODULE_VERSION}.zip ./tests/_data/mollie.zip
fi
- >
if [[ "${TEST_ACCEPTANCE}" = "true" ]]; then
yarn global add chromedriver
fi
# Run docker + headless Chrome and wait until PrestaShop is installed
- >
if [[ ${PRESTASHOP_VERSION} ]]; then
git clone https://github.com/PrestaShop/PrestaShop --depth 1 --branch ${PRESTASHOP_VERSION} prestashop
docker-compose up -d
nohup chromedriver --url-base=/wd/hub &
until $(curl --output /dev/null --silent --head --fail http://localhost:${PRESTASHOP_PORT}); do
printf 'Installing PrestaShop...'
sleep 5
done
printf 'PrestaShop seems to be up and running'
sudo rm ./prestashop/modules/welcome -rf
fi
script:
# Syntax checker
- if [[ "${TEST_SYNTAX}" = "true" ]]; then find controllers sql translations upgrade views countries.php mollie.php -name '*.php' | xargs -n 1 -P4 php -l; fi
# Unit tests (Codeception)
- if [[ "${TEST_UNIT}" = "true" ]]; then php codecept.phar run unit; fi
# Acceptance tests (Codeception)
- if [[ "{$TEST_ACCEPTANCE}" = "true" ]] && [[ "${TRAVIS_PULL_REQUEST}" = "false" ]]; then php codecept.phar run acceptance; fi
# Frontend tests (Jest)
- if [[ "${TEST_FRONTEND}" = "true" ]]; then cd views/js/src/ && yarn test; fi
language: php
dist: xenial
node_js:
- 10
sudo: true
services:
- docker
addons:
chrome: stable

env:
global:
- COMPOSER_NO_INTERACTION=1
- PRESTASHOP_PORT=8090

cache:
- yarn
- npm
- directories:
- "$HOME/.composer/cache"
- node_modules

matrix:
fast_finish: true
include:
- php: 5.3
dist: precise
env: TEST_SYNTAX=true SKIP_NODE=true
- php: 5.4
dist: precise
env: TEST_SYNTAX=true SKIP_NODE=true
- php: 5.5
dist: precise
env: TEST_SYNTAX=true SKIP_NODE=true
- php: 5.6
env: TEST_SYNTAX=true
- php: 7.0
env: TEST_SYNTAX=true
- php: 7.1
env: TEST_SYNTAX=true
- php: 7.2
env: TEST_SYNTAX=true
- php: 7.3
env: TEST_SYNTAX=true
- php: 7.1
env: TEST_UNIT=true
- php: 7.1
env: TEST_FRONTEND=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.5.4.2" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.5.6.2" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.6.0.5" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.6.1.23" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.7.3.4" TEST_ACCEPTANCE=true
# - php: 7.1
# env: PRESTASHOP_VERSION="1.7.4.4" TEST_ACCEPTANCE=true
- php: 7.1
env: PRESTASHOP_VERSION="1.7.5.0" TEST_ACCEPTANCE=true

before_install:
- >
if [[ "${SKIP_NODE}" != "true" ]]; then
curl -o- -L https://yarnpkg.com/install.sh | bash
export PATH="$HOME/.yarn/bin:$PATH"
fi
before_script:
# Build the release
- >
if [[ "${TEST_UNIT}" = "true" ]] || [[ "${TEST_ACCEPTANCE}" = "true" ]]; then
export MOLLIE_MODULE_VERSION=$(sed -ne "s/\\\$this->version *= *['\"]\([^'\"]*\)['\"] *;.*/\1/p" mollie.php | awk '{$1=$1};1')
make r
cp ./build/mollie-v${MOLLIE_MODULE_VERSION}.zip ./tests/_data/mollie.zip
fi
- >
if [[ "${TEST_ACCEPTANCE}" = "true" ]]; then
yarn global add chromedriver
fi
# Run docker + headless Chrome and wait until PrestaShop is installed
- >
if [[ ${PRESTASHOP_VERSION} ]]; then
git clone https://github.com/PrestaShop/PrestaShop --depth 1 --branch ${PRESTASHOP_VERSION} prestashop
docker-compose up -d
nohup chromedriver --url-base=/wd/hub &
until $(curl --output /dev/null --silent --head --fail http://localhost:${PRESTASHOP_PORT}); do
printf 'Installing PrestaShop...'
sleep 5
done
printf 'PrestaShop seems to be up and running'
sudo rm ./prestashop/modules/welcome -rf
fi
script:
# Syntax checker
- if [[ "${TEST_SYNTAX}" = "true" ]]; then find controllers sql translations upgrade views countries.php mollie.php -name '*.php' | xargs -n 1 -P4 php -l; fi
# Unit tests (Codeception)
- if [[ "${TEST_UNIT}" = "true" ]]; then php codecept.phar run unit; fi
# Acceptance tests (Codeception)
- if [[ "{$TEST_ACCEPTANCE}" = "true" ]] && [[ "${TRAVIS_PULL_REQUEST}" = "false" ]]; then php codecept.phar run acceptance; fi
# Frontend tests (Jest)
- if [[ "${TEST_FRONTEND}" = "true" ]]; then cd views/js/src/ && yarn test; fi
16 changes: 8 additions & 8 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Copyright (c) 2014, Mollie B.V.
All rights reserved.
Redistribution and use in source and binary forms, with or without 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.
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.
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.
Copyright (c) 2014, Mollie B.V.
All rights reserved.

Redistribution and use in source and binary forms, with or without 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.
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.
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.
Loading

0 comments on commit d396405

Please sign in to comment.