Переглянути джерело

Merge branch 'master' into patch-1

pull/1142/head
Alexander Schranz 1 рік тому
джерело
коміт
ea2a364353
Аккаунт користувача з таким Email не знайдено
6 змінених файлів з 296 додано та 292 видалено
  1. 10
    0
      .editorconfig
  2. 8
    5
      .github/workflows/awesomebot.yml
  3. 1
    1
      CODE-OF-CONDUCT.md
  4. 4
    3
      COLLABORATING.md
  5. 4
    4
      CONTRIBUTING.md
  6. 269
    279
      README.md

+ 10
- 0
.editorconfig Переглянути файл

@@ -0,0 +1,10 @@
1
+; This file is for unifying the coding style for different editors and IDEs.
2
+; More information at https://editorconfig.org
3
+root = true
4
+
5
+[*]
6
+indent_style = space
7
+indent_size = 2
8
+end_of_line = lf
9
+insert_final_newline = true
10
+trim_trailing_whitespace = true

+ 8
- 5
.github/workflows/awesomebot.yml Переглянути файл

@@ -3,19 +3,22 @@ on:
3 3
   push:
4 4
     branches:
5 5
       - master
6
+      
6 7
 jobs:
7 8
   build:
8 9
     runs-on: ubuntu-latest
9 10
     steps:
10
-    - uses: actions/checkout@v1
11
-    - name: Set up Ruby
12
-      uses: actions/setup-ruby@v1
11
+    - uses: actions/checkout@v4
12
+    - uses: ruby/setup-ruby@v1
13 13
       with:
14
-        ruby-version: 2.7.x
14
+        ruby-version: '2.7'
15
+        
15 16
     - name: Install Awesome Bot
16 17
       run: gem install awesome_bot
18
+      
17 19
     - name: Run Awesome Bot
18
-      run: awesome_bot README.md --request-delay 1 --allow-dupe --white-list igor.io,symfony,toranproxy.com,vagrantup.com,3v4l.org,voicesoftheelephpant.com,drupal.org,oreilly.com
20
+      run: awesome_bot README.md --request-delay 1 --allow-dupe --white-list igor.io,symfony,toranproxy.com,vagrantup.com,3v4l.org,voicesoftheelephpant.com,drupal.org,oreilly.com,youtube.com,lumen.laravel.com
21
+    
19 22
     - uses: actions/upload-artifact@v1
20 23
       if: failure()
21 24
       with:

+ 1
- 1
CODE-OF-CONDUCT.md Переглянути файл

@@ -35,7 +35,7 @@ This Code of Conduct applies both within project spaces and in public spaces
35 35
 when an individual is representing the project or its community.
36 36
 
37 37
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
38
-reported by contacting a project maintainer at awesome-php@josediazgonzalez.com. All
38
+reported by contacting a project maintainer at ziadoz@gmail.com. All
39 39
 complaints will be reviewed and investigated and will result in a response that
40 40
 is deemed necessary and appropriate to the circumstances. Maintainers are
41 41
 obligated to maintain confidentiality with regard to the reporter of an

+ 4
- 3
COLLABORATING.md Переглянути файл

@@ -13,9 +13,10 @@ If you provide feedback on a suggested project please be friendly and constructi
13 13
 ## Reviewing
14 14
 Please work through the following checklist when reviewing a project: 
15 15
 
16
-- Tag pull requests with the most relevant label(s).
17
-- Validate URLs work correctly and don't point to anything malicious.
18 16
 - Ensure suggestions adhere to [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONTRIBUTING.md).
17
+- Validate URLs work correctly and don't point to anything malicious.
18
+- Two approvals per pull request is preferred, but not required.
19
+- Simple pull requests fixing typos, formatting and broken links can be merged with a single approval.
19 20
 
20 21
 ## Enhancements
21 22
 If you have an idea on how to improve the project, please open a ticket for discussion using the `Enhancement` label. Please don’t make any broad or sweeping changes without consulting other collaborators first and reaching a consensus.
@@ -23,4 +24,4 @@ If you have an idea on how to improve the project, please open a ticket for disc
23 24
 ## Join
24 25
 If you want to help out please send an email to my Github username [at] gmail [dot] com with the subject “Awesome PHP Collaborator and a link to your Github account and I’ll get back to you as soon as I can (I'm notoriously slow, sorry).
25 26
 
26
-Thank you for taking the time to help out with Awesome PHP, your help is appreciated!
27
+Thank you for taking the time to help out with Awesome PHP, your help is appreciated!

+ 4
- 4
CONTRIBUTING.md Переглянути файл

@@ -10,15 +10,15 @@ Self-promotion is frowned upon, so please consider seriously whether your projec
10 10
 
11 11
 Also, please ensure your pull request adheres to the following guidelines:
12 12
 
13
-* Software that is PHP 7.0+, Composer-installable, PSR compliant, semantically versioned, unit tested, actively maintained and well documented in English.
14
-* Please search previous suggestions before making a new one, as yours may be a duplicate.
13
+* Software that is PHP 8.0+, Composer-installable, PSR compliant, semantically versioned, unit tested, actively maintained and well documented in English.
14
+* Please search previous suggestions before making a new one, as yours may be a duplicate and will be closed.
15 15
 * Enter a meaningful pull request description.
16
-* Please make an individual commit for each suggestion in a separate pull request.
17 16
 * Put a link to each library in your pull request ticket so it's easier to review.
17
+* Please make an individual commit for each suggestion in a separate pull request.
18 18
 * Use the following format for libraries: \[LIBRARY\]\(LINK\) - DESCRIPTION.
19 19
 * Prefix duplicate library names with their vendor or namespace followed by a space: Foo\Bar would be Foo Bar.
20 20
 * New categories, or improvements to the existing categorisation, are always welcome.
21
-* Please keep descriptions short, simple and unbiased. No buzzwords or marketing jargon.
21
+* Please keep descriptions short, simple and unbiased. No buzzwords or marketing jargon please.
22 22
 * End all descriptions with a full stop/period.
23 23
 * Check your spelling and grammar.
24 24
 * Make sure your text editor is set to remove trailing whitespace.

+ 269
- 279
README.md
Різницю між файлами не показано, бо вона завелика
Переглянути файл


Завантаження…
Відмінити
Зберегти