Skip to content

Commit

Permalink
Revert "Restore main.yml"
Browse files Browse the repository at this point in the history
This reverts commit 2a00d75.
  • Loading branch information
olleharstedt committed Aug 18, 2022
1 parent 2a00d75 commit ae33620
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 2,126 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Expand Up @@ -101,8 +101,8 @@ jobs:
# sed -i '84s/.*/ "debug"=>2,/' application/config/config.php
# cat application/config/config.php
- name: Run syntax check, CodeSniffer, MessDetector, ...
run: composer test
##- name: Run syntax check, CodeSniffer, MessDetector, ...
##run: composer test
- name: Test the server
run: |
Expand All @@ -115,10 +115,10 @@ jobs:
# wget https://chromedriver.storage.googleapis.com/2.33/chromedriver_linux64.zip
# unzip chromedriver_linux64.zip

- name: Run unit tests
env:
XDEBUG_MODE: coverage
run: php third_party/bin/phpunit --testdox --stop-on-failure tests/unit
##- name: Run unit tests
##env:
##XDEBUG_MODE: coverage
##run: php third_party/bin/phpunit --testdox --stop-on-failure tests/unit

- name: Check test coverage if cov.xml exists (won't work on PHP 8 with current phpunit version)
run: php tests/bin/check_coverage.php cov.xml 37
Expand All @@ -139,4 +139,4 @@ jobs:
- name: Run functional tests
env:
DOMAIN: localhost
run: php third_party/bin/phpunit --testdox --stop-on-failure tests/functional
run: php third_party/bin/phpunit --testdox --stop-on-failure tests/functional/acceptance/18282-FailedEmail/
4 changes: 2 additions & 2 deletions tests/TestBaseClassWeb.php
Expand Up @@ -104,7 +104,7 @@ public static function openView($url)
public static function getUrl(array $view)
{
$urlMan = \Yii::app()->urlManager;
$urlMan->setBaseUrl('https://' . self::$domain . '/index.php');
$urlMan->setBaseUrl('http://' . self::$domain . '/index.php');
//this is for testing new controllers (REFACTORING Controllers)
if(isset($view['noAdminInFront']) && $view['noAdminInFront']){
$url = $urlMan->createUrl($view['route']);
Expand All @@ -120,7 +120,7 @@ public static function getUrl(array $view)
protected function getSurveyUrl($lang = 'en')
{
$urlMan = \Yii::app()->urlManager;
$urlMan->setBaseUrl('https://' . self::$domain . '/index.php');
$urlMan->setBaseUrl('http://' . self::$domain . '/index.php');
$url = $urlMan->createUrl(
'survey/index',
[
Expand Down
2 changes: 1 addition & 1 deletion tests/bootstrap.php
Expand Up @@ -203,7 +203,7 @@
}

// NB: This line might be needed if you have PHP in a docker container.
$config['components']['db']['connectionString'] = 'mysql:host=localhost;port=3306;dbname=ls5;';
//$config['components']['db']['connectionString'] = 'mysql:host=localhost;port=3306;dbname=ls4;';

// Check that tmp and upload are set to 777 permission (OK on test system).
if (substr(sprintf('%o', fileperms(BASEPATH . '../tmp/')), -4) != '0777') {
Expand Down
590 changes: 0 additions & 590 deletions third_party/composer/autoload_classmap.php

Large diffs are not rendered by default.

16 changes: 1 addition & 15 deletions third_party/composer/autoload_files.php
Expand Up @@ -6,23 +6,9 @@
$baseDir = dirname($vendorDir);

return array(
'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
'6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'23c18046f52bef3eea034657bafda50f' => $vendorDir . '/symfony/polyfill-php81/bootstrap.php',
'e8aa6e4b5a1db2f56ae794f1505391a8' => $vendorDir . '/amphp/amp/lib/functions.php',
'76cd0796156622033397994f25b0d8fc' => $vendorDir . '/amphp/amp/lib/Internal/functions.php',
'8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
'6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
'0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
'6cd5651c4fef5ed6b63e8d8b8ffbf3cc' => $vendorDir . '/amphp/byte-stream/lib/functions.php',
'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
'3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
'2a3c2110e8e0295330dc3d11a4cbc4cb' => $vendorDir . '/php-webdriver/webdriver/lib/Exception/TimeoutException.php',
'56823cacd97af379eceaf82ad00b928f' => $vendorDir . '/phpseclib/bcmath_compat/lib/bcmath.php',
'dc51568953534d6c54b08731e61104e2' => $vendorDir . '/vimeo/psalm/src/functions.php',
'8e4171839e12546525126d38dac3dafa' => $vendorDir . '/vimeo/psalm/src/spl_object_id.php',
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
);
3 changes: 0 additions & 3 deletions third_party/composer/autoload_namespaces.php
Expand Up @@ -7,7 +7,4 @@

return array(
'Twig_' => array($vendorDir . '/twig/twig/lib'),
'PHPMD\\' => array($vendorDir . '/phpmd/phpmd/src/main/php'),
'LSS' => array($vendorDir . '/openlss/lib-array2xml'),
'JsonMapper' => array($vendorDir . '/netresearch/jsonmapper/src'),
);
38 changes: 0 additions & 38 deletions third_party/composer/autoload_psr4.php
Expand Up @@ -6,40 +6,13 @@
$baseDir = dirname($vendorDir);

return array(
'tebazil\\yii1seeder\\' => array($vendorDir . '/tebazil/yii1-db-seeder/src'),
'tebazil\\dbseeder\\' => array($vendorDir . '/tebazil/db-seeder/src'),
'phpseclib3\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
'phpDocumentor\\Reflection\\' => array($vendorDir . '/phpdocumentor/reflection-common/src', $vendorDir . '/phpdocumentor/reflection-docblock/src', $vendorDir . '/phpdocumentor/type-resolver/src'),
'bcmath_compat\\' => array($vendorDir . '/phpseclib/bcmath_compat/src'),
'XdgBaseDir\\' => array($vendorDir . '/dnoegel/php-xdg-base-dir/src'),
'Webmozart\\PathUtil\\' => array($vendorDir . '/webmozart/path-util/src'),
'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
'Twig\\' => array($vendorDir . '/twig/twig/src'),
'Symfony\\Polyfill\\Php81\\' => array($vendorDir . '/symfony/polyfill-php81'),
'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
'Symfony\\Polyfill\\Php73\\' => array($vendorDir . '/symfony/polyfill-php73'),
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'),
'Symfony\\Polyfill\\Intl\\Grapheme\\' => array($vendorDir . '/symfony/polyfill-intl-grapheme'),
'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
'Symfony\\Contracts\\Service\\' => array($vendorDir . '/symfony/service-contracts'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
'Symfony\\Component\\String\\' => array($vendorDir . '/symfony/string'),
'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
'Symfony\\Component\\DependencyInjection\\' => array($vendorDir . '/symfony/dependency-injection'),
'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
'SPSS\\' => array($vendorDir . '/tiamo/spss/src'),
'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
'Psalm\\' => array($vendorDir . '/vimeo/psalm/src/Psalm'),
'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src/Prophecy'),
'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
'PackageVersions\\' => array($vendorDir . '/composer/package-versions-deprecated/src/PackageVersions'),
'PHPUnit\\DbUnit\\' => array($vendorDir . '/misantron/dbunit/src'),
'PDepend\\' => array($vendorDir . '/pdepend/pdepend/src/main/php/PDepend'),
'LimeSurvey\\PluginManager\\' => array($baseDir . '/application/libraries/PluginManager', $baseDir . '/application/libraries/PluginManager/Storage'),
'LimeSurvey\\Models\\Services\\' => array($baseDir . '/application/models/services'),
'LimeSurvey\\Menu\\' => array($baseDir . '/application/libraries/MenuObjects'),
Expand All @@ -48,15 +21,4 @@
'LimeSurvey\\ExtensionInstaller\\' => array($baseDir . '/application/libraries/ExtensionInstaller'),
'LimeSurvey\\Exceptions\\' => array($baseDir . '/application/exceptions'),
'LimeSurvey\\Datavalueobjects\\' => array($baseDir . '/application/datavalueobjects'),
'LanguageServerProtocol\\' => array($vendorDir . '/felixfbecker/language-server-protocol/src'),
'Faker\\' => array($vendorDir . '/fzaninotto/faker/src/Faker'),
'Facebook\\WebDriver\\' => array($vendorDir . '/php-webdriver/webdriver/lib'),
'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'),
'Composer\\XdebugHandler\\' => array($vendorDir . '/composer/xdebug-handler/src'),
'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
'Composer\\Pcre\\' => array($vendorDir . '/composer/pcre/src'),
'Amp\\ByteStream\\' => array($vendorDir . '/amphp/byte-stream/lib'),
'Amp\\' => array($vendorDir . '/amphp/amp/lib'),
'AdvancedJsonRpc\\' => array($vendorDir . '/felixfbecker/advanced-json-rpc/lib'),
);

0 comments on commit ae33620

Please sign in to comment.