diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml new file mode 100644 index 000000000..13d1bdfa7 --- /dev/null +++ b/.github/workflows/continuous-integration.yml @@ -0,0 +1,44 @@ +name: "Continuous Integration" + +on: [push] + +env: + fail-fast: true + +jobs: + tests: + name: "Symfony1 Tests" + runs-on: "ubuntu-22.04" + + strategy: + matrix: + php-version: + - "7.4" + # - "8.0" + # - "8.1" + memcached-version: + - "1.6" + + services: + memcached: + image: "memcached:${{ matrix.memcached-version }}" + + steps: + - name: "Checkout" + uses: "actions/checkout@v3" + with: + submodules: "true" + + - name: "Install PHP" + uses: "shivammathur/setup-php@v2" + with: + php-version: "${{ matrix.php-version }}" + + - name: "Install dependencies with Composer" + uses: "ramsey/composer-install@v2" + + - name: "Run Check configuration" + run: "php data/bin/check_configuration.php" + + - name: "Run Tests" + run: "php data/bin/symfony symfony:test --trace" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c163be702..000000000 --- a/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -os: linux -dist: xenial -language: php - -php: - - 7.0 - - 7.1 - - 7.2 - - 7.3 - - 7.4 - - nightly - -# run build against nightly but allow them to fail -jobs: - fast_finish: true - allow_failures: - - php: nightly - include: - - php: 5.3 - dist: precise - - php: 5.4 - dist: precise - - php: 5.5 - dist: trusty - - php: 5.6 - dist: trusty - -services: - - memcached - -cache: - directories: - - $HOME/.composer/cache - -before_install: - - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;' - - sh -c 'if [ $(php -r "echo PHP_RELEASE_VERSION;") -le 98 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;' - -install: - # by default, --remote is not used on travis - - git submodule update --remote --force - - composer install --prefer-dist --no-progress --no-suggest -o - -script: - - php data/bin/check_configuration.php - - php data/bin/symfony symfony:test --trace diff --git a/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine b/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine index 0564971b2..f8ea8b76c 160000 --- a/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine +++ b/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine @@ -1 +1 @@ -Subproject commit 0564971b2badd778914ac0fcb74518a00d6918f1 +Subproject commit f8ea8b76cb3f932a4a21aa146c0ebc27939ccc04 diff --git a/lib/vendor/swiftmailer b/lib/vendor/swiftmailer index 4cc928420..181b89f18 160000 --- a/lib/vendor/swiftmailer +++ b/lib/vendor/swiftmailer @@ -1 +1 @@ -Subproject commit 4cc92842069c2bbc1f28daaaf1d2576ec4dfe153 +Subproject commit 181b89f18a90f8925ef805f950d47a7190e9b950 diff --git a/test/unit/validator/sfValidatorFileTest.php b/test/unit/validator/sfValidatorFileTest.php index 43412cffc..42463acfa 100755 --- a/test/unit/validator/sfValidatorFileTest.php +++ b/test/unit/validator/sfValidatorFileTest.php @@ -105,7 +105,7 @@ public function getMimeTypesFromCategory($category) $v = new testValidatorFile(); $t->is($v->guessFromFileBinary($tmpDir.'/test.txt'), 'text/plain', '->guessFromFileBinary() guesses the type of a given file'); $t->is($v->guessFromFileBinary($tmpDir.'/foo.txt'), null, '->guessFromFileBinary() returns null if the file type is not guessable'); -$t->is($v->guessFromFileBinary('/bin/ls'), (PHP_OS != 'Darwin') ? 'application/x-executable' : 'application/octet-stream', '->guessFromFileBinary() returns correct type if file is guessable'); +$t->is($v->guessFromFileBinary('/bin/ls'), (PHP_OS != 'Darwin') ? 'application/x-pie-executable' : 'application/octet-stream', '->guessFromFileBinary() returns correct type if file is guessable'); $t->is($v->guessFromFileBinary('-test'), null, '->guessFromFileBinary() returns null if file path has leading dash'); // ->getMimeType()