[pull] master from orangehrm:master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,11 +30,11 @@ Please describe what you expected to happen.
 Provide error logs depending on the issue.
 
 If issue related to installation:
-- installer/log.txt
+- src/log/installer.log
 - logInsatall.log
 
 If issue related to any other
-- symfony/log/orangehrm.log 
+- src/log/orangehrm.log 
 
 **Screenshots**
 If applicable, add screenshots to help explain your problem.

.github/workflows/build.yml

@@ -0,0 +1,57 @@
+name: Build
+
+on: [ push, pull_request ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Validate composer.json and composer.lock
+        run: |
+          cd src
+          composer validate --strict
+
+      - name: Parse Git short hash
+        run: echo "git_short_hash=$(git rev-parse --short $GITHUB_SHA)" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: |
+          cd src
+          php7.4 -f /usr/bin/composer install --no-dev
+          php7.4 -f /usr/bin/composer dump-autoload --optimize --no-dev --classmap-authoritative
+          cd client
+          yarn install
+          cd ../../installer/client
+          yarn install
+
+      - name: Dump build file
+        run: |
+          cd build
+          echo "SHA: $GITHUB_SHA" > build
+          echo "Repository: $GITHUB_REPOSITORY" >> build
+          echo "Branch: $GITHUB_HEAD_REF" >> build
+
+      - name: Run build
+        run: |
+          cd src/client
+          yarn build
+          cd ../../installer/client
+          yarn build
+          cd ../../build
+          wget https://www.phing.info/get/phing-latest.phar
+          php phing-latest.phar dist
+
+      - name: Find build file
+        run: |
+          cd build
+          echo "file_path=$(find dist/ -maxdepth 1 -name '*.zip')" >> $GITHUB_ENV
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: orangehrm-${{ env.git_short_hash }}
+          path: build/${{ env.file_path }}

.github/workflows/cypress.yml

@@ -0,0 +1,108 @@
+name: Cypress
+
+on: [ push, pull_request ]
+
+jobs:
+  cypress:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Environment
+        uses: actions/checkout@v2
+        with:
+          repository: orangehrm/orangehrm-os-dev-environment
+
+      - name: Checkout OrangeHRM
+        uses: actions/checkout@v2
+        with:
+          path: html
+
+      - name: Configure Docker Environment
+        run: |
+          pwd
+          ls -la
+          ls html
+          git rev-parse HEAD
+          echo "git_hash=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          cp .env.dist .env
+          sed -i "s~LOCAL_SRC=/your/src/path~LOCAL_SRC=$PWD/html~g" .env
+          echo "127.0.0.1 php56 php70 php71 php72 php73 php74 php80" | sudo tee -a /etc/hosts
+          docker version
+          docker info
+          docker images
+
+      - name: Cache docker image
+        id: cache-docker-images
+        uses: actions/cache@v2
+        with:
+          path: image-cache
+          key: images-${{ env.git_hash }}
+
+      - name: Build docker image
+        if: steps.cache-docker-images.outputs.cache-hit != 'true'
+        run: |
+          set -ex
+          docker-compose -f docker-compose.yml -f docker-compose-build.yml build nginx php-8.0
+          docker images
+          mkdir image-cache
+          docker save --output image-cache/images.tar samanthajayasinghe/ohrm-nginx samanthajayasinghe/ohrm-php80
+          ls -sh image-cache/images.tar
+
+      - name: Load docker image from cache
+        if: steps.cache-docker-images.outputs.cache-hit == 'true'
+        run: |
+          ls image-cache
+          docker load --input image-cache/images.tar
+
+      - name: Start docker containers
+        run: |
+          docker-compose up -d php-8.0 mysql55
+          docker ps
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install dependencies
+        run: |
+          cd html
+          git rev-parse HEAD
+          cd src/client && yarn install
+          docker exec os_dev_php80 bash -c 'cd src && composer install'
+
+      - name: Install OrangeHRM
+        run: |
+          docker exec os_dev_php80 bash --login -c 'cd src/client && yarn build'
+          docker exec os_dev_php80 bash -c "sed -i 's/hostName: 127.0.0.1/hostName: mysql55/g' installer/cli_install_config.yaml"
+          docker exec os_dev_php80 bash -c "sed -i 's/adminPassword: Ohrm@1423/adminPassword: Admin@123/g' installer/cli_install_config.yaml"
+          docker exec os_dev_php80 bash -c "sed -i 's/adminEmployeeFirstName: OrangeHRM/adminEmployeeFirstName: Samantha/g' installer/cli_install_config.yaml"
+          docker exec os_dev_php80 bash -c "sed -i 's/adminEmployeeLastName: Admin/adminEmployeeLastName: Jayasinghe/g' installer/cli_install_config.yaml"
+          docker exec os_dev_php80 bash -c "sed -i 's/public const PRODUCT_MODE = self::MODE_PROD/public const PRODUCT_MODE = self::MODE_DEV/g' src/lib/config/Config.php"
+          docker exec os_dev_php80 bash -c 'chmod -R 777 src/log'
+          docker exec os_dev_php80 bash -c 'chmod -R 777 src/config'
+          docker exec os_dev_php80 bash -c 'php installer/cli_install.php'
+
+      - name: Run tests
+        run: |
+          docker exec os_dev_php80 bash -c 'php src/test/functional/tools/prepare.php'
+          cd html/src/test/functional
+          sed -i 's~http://php80/orangehrm/web/index.php~http://php80/web/index.php~g' cypress.json
+          sed -i 's~false~true~g' cypress.json
+          sed -i 's~6000~10000~g' cypress.json
+          yarn install
+          yarn test
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: videos-${{ github.sha }}
+          path: html/src/test/functional/cypress/videos

.github/workflows/linting.yml

@@ -0,0 +1,58 @@
+name: Lint
+
+on: [ push, pull_request ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install node dependencies
+        run: cd src/client && yarn install
+
+      - name: Lint client code
+        run: cd src/client && yarn lint
+
+      - name: Lint installer client code
+        run: |
+          cd installer/client
+          yarn install
+          yarn lint
+
+      - name: Lint Cypress tests
+        run: cd src/test/functional && yarn install && yarn lint
+
+      - name: Install dependencies
+        run: |
+          php7.4 -f /usr/bin/composer install -d src
+          php7.4 -f /usr/bin/composer install -d devTools/core
+
+      - name: Check PHP Coding Standards
+        run: php devTools/core/console.php php-cs-fix --php php7.4
+
+      - name: Check files changed
+        id: git-status
+        run: |
+          git status --porcelain
+          echo "::set-output name=status::$(git status --porcelain)"
+
+      - name: Fail if files changed
+        if: ${{ steps.git-status.outputs.status }}
+        uses: actions/github-script@v3
+        with:
+          script: |
+            core.setFailed('Files changed with lint fix')
+
+      - name: Creating diff
+        if: ${{ failure() }}
+        run: |
+          git status
+          git diff > ${{ github.sha }}.diff
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: diff-${{ github.sha }}
+          path: ${{ github.sha }}.diff

.github/workflows/test.yml

@@ -0,0 +1,103 @@
+name: Test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+
+    runs-on: ubuntu-18.04
+
+    services:
+      mysql:
+        image: mariadb:10.3
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Validate composer.json and composer.lock
+        run: |
+          cd src
+          composer validate --strict
+
+      - name: Parse Git short hash
+        run: echo "git_short_hash=$(git rev-parse --short $GITHUB_SHA)" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: |
+          cd src
+          php7.4 -f /usr/bin/composer install
+          php7.4 -f /usr/bin/composer dump-autoload -o
+          cd client
+          yarn install
+
+      - name: Install OrangeHRM
+        run: |
+          php7.4 installer/cli_install.php
+          php7.4 devTools/general/create-test-db.php root
+
+      - name: Run Jest
+        run: |
+          cd src/client
+          yarn test:unit --coverage
+
+      - name: Run test
+        run: |
+          XDEBUG_MODE=coverage ./src/vendor/bin/phpunit --coverage-html coverage -d memory_limit=1G
+          tar cf - coverage/ | xz -z - > coverage.tar.xz
+
+      - name: Upload jest coverage
+        uses: actions/upload-artifact@v2
+        with:
+          name: jest-coverage
+          path: src/client/coverage
+
+      - name: Upload phpunit coverage
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverage
+          path: coverage.tar.xz
+
+      - name: Install dev tools dependencies
+        run: |
+          php7.4 -f /usr/bin/composer install -d devTools/core
+
+      - name: Check dev tool commands
+        run: |
+          php devTools/core/console.php i:reinstall
+          php devTools/core/console.php i:reset
+
+  composer_v1_check:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use composer v1
+        run: sudo composer self-update --1
+
+      - name: Validate composer.json and composer.lock
+        run: |
+          cd src
+          php7.4 -f /usr/bin/composer validate --strict
+          php8.0 -f /usr/bin/composer validate --strict
+          php8.1 -f /usr/bin/composer validate --strict
+
+      - name: Install depandancies on PHP 7.4
+        run: |
+          cd src
+          php7.4 -f /usr/bin/composer install
+          php7.4 -f /usr/bin/composer dump-autoload -o
+
+      - name: Install depandancies on PHP 8.0
+        run: |
+          cd src
+          rm -rf vendor
+          php8.0 -f /usr/bin/composer install
+          php8.0 -f /usr/bin/composer dump-autoload -o

.gitignore

@@ -1,12 +1,15 @@
 .idea
+.vscode
 lib/confs/
-symfony/cache/
-symfony/config/
-symfony/log/
-symfony/web/
-symfony/apps/orangehrm/config/
-symfony/lib/vendor
+src/cache/
+src/config/
+src/log/
+web/dist/
+src/vendor
 apidoc
-symfony/test/api/tests/_output/
-installer/log.txt
 logInsatall.log
+.phpunit.result.cache
+coverage/
+src/plugins/orangehrmFunctionalTestingPlugin
+.php-cs-fixer.cache
+.php-cs-fixer.php