浏览代码

Merge branch 'master' into master

pull/798/head
Alexander Kartavenko 1年前
父节点
当前提交
79f93afdde
没有帐户链接到提交者的电子邮件
共有 8 个文件被更改,包括 546 次插入616 次删除
  1. 10
    0
      .editorconfig
  2. 26
    0
      .github/workflows/awesomebot.yml
  3. 0
    9
      .travis.yml
  4. 0
    65
      .varci.yml
  5. 1
    1
      CODE-OF-CONDUCT.md
  6. 4
    3
      COLLABORATING.md
  7. 8
    7
      CONTRIBUTING.md
  8. 497
    531
      README.md

+ 10
- 0
.editorconfig 查看文件

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

+ 26
- 0
.github/workflows/awesomebot.yml 查看文件

1
+name: Awesome Bot
2
+on:
3
+  push:
4
+    branches:
5
+      - master
6
+      
7
+jobs:
8
+  build:
9
+    runs-on: ubuntu-latest
10
+    steps:
11
+    - uses: actions/checkout@v4
12
+    - uses: ruby/setup-ruby@v1
13
+      with:
14
+        ruby-version: '2.7'
15
+        
16
+    - name: Install Awesome Bot
17
+      run: gem install awesome_bot
18
+      
19
+    - name: Run Awesome Bot
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
+    
22
+    - uses: actions/upload-artifact@v1
23
+      if: failure()
24
+      with:
25
+        name: ab-results
26
+        path: ab-results-README.md-filtered.json

+ 0
- 9
.travis.yml 查看文件

1
-language: ruby
2
-rvm:
3
-  - 2.2
4
-before_script:
5
-  - gem install awesome_bot
6
-script:
7
-  - awesome_bot README.md --white-list igor.io,symfony,toranproxy.com,vagrantup.com,3v4l.org,voicesoftheelephpant.com
8
-notifications:
9
-  email: false

+ 0
- 65
.varci.yml 查看文件

1
-ruleset:
2
-
3
-  body_link:
4
-    name: "Pull requests that add links should also include them in the body"
5
-    events: [ pull_request ]
6
-    when:
7
-      - action = "opened"
8
-      - files = ["README.md"]
9
-      - deletions = 0
10
-      - not (body_links.added contains diff_links.added)
11
-    comment: |
12
-      This pull request adds the following suggestion:
13
-
14
-      {{ diff.added.0 }}
15
-
16
-  broken_link:
17
-    name: "Pull request diff contains broken links"
18
-    events: [ pull_request ]
19
-    when:
20
-      - action = "opened"
21
-      - count(diff_links.broken) > 0
22
-    comment: >
23
-      @{{ user.login }}, at least one of the links in the pull request diff was
24
-      reported as broken:
25
-
26
-      - {{ diff_links.broken.0 }}
27
-
28
-  missing_link:
29
-    name: "Suggestions should include a link"
30
-    events: [ pull_request ]
31
-    when:
32
-      - action = "opened"
33
-      - files = ["README.md"]
34
-      - deletions = 0
35
-      - additions = 1
36
-      - count(grep("/^\* /", diff.added)) = 1
37
-      - count(diff_links.added) != 1
38
-    comment: >
39
-      @{{ user.login }}, it looks like you have added a new suggestion to the
40
-      `README.md` file but haven't linked to the project. Please update the
41
-      `README.md` to also link to the project, thanks!
42
-
43
-  multiple_additions:
44
-    name: "Pull request should only suggest one addition at a time"
45
-    events: [ pull_request ]
46
-    comment: |
47
-      @{{ user.login }}, it looks like you are trying to add multiple suggestions in a single pull request.
48
-
49
-      If so, please split these into multiple pull requests so each item's inclusion in the list can be discussed separately.
50
-    when:
51
-      - action = "opened"
52
-      - files = ["README.md"]
53
-      - deletions = 0
54
-      - count(grep("/^\* /", diff.added)) > 1
55
-
56
-  needs_explanation:
57
-    name: 'Pull request bodies should have a detailed explanation'
58
-    events: [ pull_request ]
59
-    label: 'needs: explanation'
60
-    when:
61
-      - action = "opened"
62
-      - length(body) < 25
63
-    message: >
64
-      @{{ user.login }}, please update the pull request body with a description
65
-      of what you are adding or changing (of at least 25 characters).

+ 1
- 1
CODE-OF-CONDUCT.md 查看文件

35
 when an individual is representing the project or its community.
35
 when an individual is representing the project or its community.
36
 
36
 
37
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
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
 complaints will be reviewed and investigated and will result in a response that
39
 complaints will be reviewed and investigated and will result in a response that
40
 is deemed necessary and appropriate to the circumstances. Maintainers are
40
 is deemed necessary and appropriate to the circumstances. Maintainers are
41
 obligated to maintain confidentiality with regard to the reporter of an
41
 obligated to maintain confidentiality with regard to the reporter of an

+ 4
- 3
COLLABORATING.md 查看文件

13
 ## Reviewing
13
 ## Reviewing
14
 Please work through the following checklist when reviewing a project: 
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
 - Ensure suggestions adhere to [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONTRIBUTING.md).
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
 ## Enhancements
21
 ## Enhancements
21
 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.
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
 ## Join
24
 ## Join
24
 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
 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!

+ 8
- 7
CONTRIBUTING.md 查看文件

1
 # Contribution Guidelines
1
 # Contribution Guidelines
2
-Unfortunately, not every library, tool or framework can be considered for inclusion. The aim of Awesome PHP is to be a concise list of noteworthy and interesting software written in modern PHP. Therefore, suggested software should: 
2
+Unfortunately, not every library, tool or framework can be considered for inclusion. The aim of Awesome PHP is to be a concise list of noteworthy and interesting software written in modern PHP. Therefore, suggested software should:
3
 
3
 
4
-1. Be widely recommended regardless of personal opinion
4
+1. Be widely recommended
5
 2. Well known or discussed within the PHP community
5
 2. Well known or discussed within the PHP community
6
 3. Be unique in its approach or function
6
 3. Be unique in its approach or function
7
-4. Fill a niche gap in the market  
7
+4. Fill a niche gap in the market
8
 
8
 
9
 Self-promotion is frowned upon, so please consider seriously whether your project meets the criteria before opening a pull request, otherwise it may be closed without being reviewed.
9
 Self-promotion is frowned upon, so please consider seriously whether your project meets the criteria before opening a pull request, otherwise it may be closed without being reviewed.
10
 
10
 
11
 Also, please ensure your pull request adheres to the following guidelines:
11
 Also, please ensure your pull request adheres to the following guidelines:
12
 
12
 
13
-* Software that is PHP 5.5+, Composer-installable, PSR compliant, semantically versioned, united tested and well documented in English is preferred.
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
 * Enter a meaningful pull request description.
15
 * Enter a meaningful pull request description.
16
-* Please make an individual commit for each suggestion in a separate pull request.
17
 * Put a link to each library in your pull request ticket so it's easier to review.
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
 * Use the following format for libraries: \[LIBRARY\]\(LINK\) - DESCRIPTION.
18
 * Use the following format for libraries: \[LIBRARY\]\(LINK\) - DESCRIPTION.
19
 * Prefix duplicate library names with their vendor or namespace followed by a space: Foo\Bar would be Foo Bar.
19
 * Prefix duplicate library names with their vendor or namespace followed by a space: Foo\Bar would be Foo Bar.
20
 * New categories, or improvements to the existing categorisation, are always welcome.
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
 * End all descriptions with a full stop/period.
22
 * End all descriptions with a full stop/period.
23
 * Check your spelling and grammar.
23
 * Check your spelling and grammar.
24
 * Make sure your text editor is set to remove trailing whitespace.
24
 * Make sure your text editor is set to remove trailing whitespace.
25
+* Your entry has been added alphabetically within the category.
25
 
26
 
26
 Thank you for your suggestions!
27
 Thank you for your suggestions!

+ 497
- 531
README.md
文件差异内容过多而无法显示
查看文件


正在加载...
取消
保存