Merge pull request #34 from Laravel-Lang/2.x

[2.x] Upgrade to new structure

Author: Andrey Helldar

.gitattributes

@@ -1,15 +1,17 @@
 * text=auto
 
 .github/ export-ignore
-.run/ export-ignore
+tests/ export-ignore
 
+app/ export-ignore
 docs/ export-ignore
-tests/ export-ignore
+excludes/ export-ignore
 
-.codecov.yml export-ignore
+.editorconfig export-ignore
+.env.example export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.styleci.yml export-ignore
 
-phpunit.php export-ignore
+package.json export-ignore
+
 phpunit.xml export-ignore

.github/workflows/phpunit.yml

@@ -1,8 +1,11 @@
 name: phpunit
-on: [ push, pull_request ]
+
+on: [ push ]
+
+permissions: read-all
 
 jobs:
-    build:
+    laravel:
         runs-on: ubuntu-latest
 
         name: PHP Unit
@@ -16,9 +19,11 @@ jobs:
                 with:
                     extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, json
                     coverage: none
+                env:
+                    COMPOSER_TOKEN: ${{ secrets.COMPOSER_TOKEN }}
 
             -   name: Install dependencies
                 run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction
 
             -   name: Execute tests
-                run: sudo vendor/bin/phpunit
+                run: sudo vendor/bin/phpunit --colors=always

.github/workflows/update.yml

@@ -4,6 +4,8 @@ on:
         branches:
             - main
 
+permissions: write-all
+
 jobs:
     update:
         runs-on: ubuntu-latest
@@ -33,43 +35,19 @@ jobs:
                 run: |
                     IS_DIRTY=1
 
-                    php app/keys.php
+                    vendor/bin/lang sync
 
                     { git add . && git commit -a -m "Updating translations keys"; } || IS_DIRTY=0
 
                     echo ::set-output name=is_dirty::${IS_DIRTY}
 
-            -   name: Updating referents
-                id: referents
-                if: success()
-                run: |
-                    IS_DIRTY=1
-
-                    php app/referents.php
-
-                    { git add . && git commit -a -m "Updating the docs/referents.md file"; } || IS_DIRTY=0
-
-                    echo ::set-output name=is_dirty::${IS_DIRTY}
-
-            -   name: Checking for excludes
-                id: excludes
-                if: success()
-                run: |
-                    IS_DIRTY=1
-
-                    php app/excludes.php
-
-                    { git add . && git commit -a -m "Updating excludes files"; } || IS_DIRTY=0
-
-                    echo ::set-output name=is_dirty::${IS_DIRTY}
-
             -   name: Update statuses
                 id: status
                 if: success()
                 run: |
                     IS_DIRTY=1
 
-                    php app/status.php
+                    vendor/bin/lang status
 
                     { git add . && git commit -a -m "Updated status of translations"; } || IS_DIRTY=0
 
@@ -79,9 +57,7 @@ jobs:
                 uses: ad-m/github-push-action@master
                 if: |
                     success() && (
-                    steps.excludes.outputs.is_dirty == 1 ||
                     steps.keys.outputs.is_dirty == 1 ||
-                    steps.referents.outputs.is_dirty == 1 ||
                     steps.status.outputs.is_dirty == 1
                     )
                 with:

.gitignore

@@ -1,9 +1,20 @@
 .idea/
-
-vendor/
+_site/
 build/
+node_modules/
+vendor/
 
+.cache
+.DS_Store
+.env
+.php_cs.cache
+.phpintel
+.temp
+
+*.bak
 *.cache
 *.clover
-*.lock
 *.orig
+
+composer.lock
+package-lock.json