From b01993abcfd89c54eb84d81de2d10279fe863711 Mon Sep 17 00:00:00 2001 From: Hafez Divandari Date: Fri, 9 Feb 2024 02:16:56 +0330 Subject: [PATCH] wip --- .github/workflows/queues.yml | 160 ----------------- .github/workflows/tests.yml | 169 ------------------ .../Database/SchemaBuilderSchemaNameTest.php | 12 +- 3 files changed, 7 insertions(+), 334 deletions(-) delete mode 100644 .github/workflows/queues.yml delete mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml deleted file mode 100644 index fd583e6c3f8..00000000000 --- a/.github/workflows/queues.yml +++ /dev/null @@ -1,160 +0,0 @@ -name: queues - -on: - push: - branches: - - master - - '*.x' - pull_request: - -jobs: - sync: - runs-on: ubuntu-22.04 - - strategy: - fail-fast: true - - name: Sync Driver - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Install dependencies - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Queue - env: - QUEUE_CONNECTION: sync - - database: - runs-on: ubuntu-22.04 - - strategy: - fail-fast: true - - name: Database Driver - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Install dependencies - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Queue - env: - DB_CONNECTION: testing - QUEUE_CONNECTION: database - - redis: - runs-on: ubuntu-22.04 - - services: - redis: - image: redis:7.0 - ports: - - 6379:6379 - options: --entrypoint redis-server - - strategy: - fail-fast: true - - name: Redis Driver - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Install dependencies - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Queue - env: - QUEUE_CONNECTION: redis - - beanstalkd: - runs-on: ubuntu-22.04 - - name: Beanstalkd Driver - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Download & Extract beanstalkd - run: curl -L https://github.com/beanstalkd/beanstalkd/archive/refs/tags/v1.13.tar.gz | tar xz - - - name: Make beanstalkd - run: make - working-directory: beanstalkd-1.13 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Install dependencies - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Daemonize beanstalkd - run: ./beanstalkd-1.13/beanstalkd & - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Queue - env: - QUEUE_CONNECTION: beanstalkd diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml deleted file mode 100644 index 093ad63b795..00000000000 --- a/.github/workflows/tests.yml +++ /dev/null @@ -1,169 +0,0 @@ -name: tests - -on: - push: - branches: - - master - - '*.x' - pull_request: - schedule: - - cron: '0 0 * * *' - -jobs: - linux_tests: - runs-on: ubuntu-22.04 - - services: - memcached: - image: memcached:1.6-alpine - ports: - - 11211:11211 - mysql: - image: mysql:5.7 - env: - MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_DATABASE: forge - ports: - - 33306:3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - redis: - image: redis:7.0 - ports: - - 6379:6379 - options: --entrypoint redis-server - dynamodb: - image: amazon/dynamodb-local:2.0.0 - ports: - - 8888:8000 - - strategy: - fail-fast: true - matrix: - php: [8.2, 8.3] - phpunit: ['10.5', '11.0.1'] - stability: [prefer-lowest, prefer-stable] - - name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-phpredis/phpredis@5.3.7, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr - ini-values: error_reporting=E_ALL - tools: composer:v2 - coverage: none - env: - REDIS_CONFIGURE_OPTS: --enable-redis --enable-redis-igbinary --enable-redis-msgpack --enable-redis-lzf --with-liblzf --enable-redis-zstd --with-libzstd --enable-redis-lz4 --with-liblz4 - REDIS_LIBS: liblz4-dev, liblzf-dev, libzstd-dev - - - name: Set minimum PHP 8.2 versions - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require guzzlehttp/psr7:^2.4 --no-interaction --no-update - - - name: Set PHPUnit - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require phpunit/phpunit:^${{ matrix.phpunit }} --dev --no-interaction --no-update - - - name: Install dependencies - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit --display-deprecation - env: - DB_PORT: ${{ job.services.mysql.ports[3306] }} - DB_USERNAME: root - DYNAMODB_CACHE_TABLE: laravel_dynamodb_test - DYNAMODB_ENDPOINT: "http://localhost:8888" - AWS_ACCESS_KEY_ID: randomKey - AWS_SECRET_ACCESS_KEY: randomSecret - - - name: Store artifacts - uses: actions/upload-artifact@v3 - with: - name: logs - path: | - vendor/orchestra/testbench-core/laravel/storage/logs - !vendor/**/.gitignore - - windows_tests: - runs-on: windows-2019 - - strategy: - fail-fast: true - matrix: - php: [8.2, 8.3] - phpunit: ['10.5', '11.0.1'] - stability: [prefer-lowest, prefer-stable] - - name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows - - steps: - - name: Set git to use LF - run: | - git config --global core.autocrlf false - git config --global core.eol lf - - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, gd, pdo_mysql, fileinfo, ftp, redis, memcached, gmp, intl, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Minimum PHP 8.2 Versions - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require guzzlehttp/psr7:~2.4 --no-interaction --no-update - - - name: Set PHPUnit - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require phpunit/phpunit:~${{ matrix.phpunit }} --dev --no-interaction --no-update - - - name: Install dependencies - uses: nick-fields/retry@v2 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit - env: - AWS_ACCESS_KEY_ID: random_key - AWS_SECRET_ACCESS_KEY: random_secret - - - name: Store artifacts - uses: actions/upload-artifact@v3 - with: - name: logs - path: | - vendor/orchestra/testbench-core/laravel/storage/logs - !vendor/**/.gitignore diff --git a/tests/Integration/Database/SchemaBuilderSchemaNameTest.php b/tests/Integration/Database/SchemaBuilderSchemaNameTest.php index 79478dc2ca8..cda41b2ecad 100644 --- a/tests/Integration/Database/SchemaBuilderSchemaNameTest.php +++ b/tests/Integration/Database/SchemaBuilderSchemaNameTest.php @@ -33,9 +33,11 @@ protected function defineEnvironment($app) $this->app['config']->set('database.connections.with-prefix.prefix', 'example_'); } - #[DataProvider('schemaProvider')] - public function testCreate(Builder $schema) + #[DataProvider('connectionProvider')] + public function testCreate($connection) { + $schema = Schema::connection($connection); + $schema->create('my_schema.table', function (Blueprint $table) { $table->id(); }); @@ -46,11 +48,11 @@ public function testCreate(Builder $schema) $this->assertFalse($schema->hasTable('table')); } - public static function schemaProvider(): array + public static function connectionProvider(): array { return [ - 'without prefix' => [Schema::connection('without-prefix')], - 'with prefix' => [Schema::connection('with-prefix')] + 'without prefix' => ['without-prefix'], + 'with prefix' => ['with-prefix'], ]; } }