Merge branch 'master' into feature/table-of-contents

mathroc · web-flow · commit 2f76c8de3030 · 2024-08-29T17:31:02.000+02:00
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: weekly
diff --git a/composer.lock b/composer.lock
diff --git a/source/_authors/crell.twig b/source/_authors/crell.twig
@@ -1,9 +1,8 @@
 ---
 title: Larry Garfield
 identifier: crell
-twitter: Crell
 avatar: /img/blog/avatars/larry-garfield.jpg
-bio: Larry Garfield is an aspiring blacksmith who moonlights as Director of Developer Experience for Platform.sh.  Since 2017 he has been a member of the PHP-FIG Core Committee. PSR-8 compatible.
+bio: Larry Garfield is an aspiring blacksmith who moonlights as a Staff Engineer for LegalZoom.  Since 2017 he has been a member of the PHP-FIG Core Committee. PSR-8 compatible.
 use:
 - posts
 ---
diff --git a/source/_bylaws/010-funding.twig b/source/_bylaws/010-funding.twig
@@ -0,0 +1,7 @@
+---
+title: Funding
+markdown_source: fig-standards/bylaws/010-funding.md
+use: [bylaws]
+---
+
+{{ parent() }}
diff --git a/source/_includes/fig-standards b/source/_includes/fig-standards
@@ -1 +1 @@
-Subproject commit cc4af34c8cd4d37fe0734144c218c4db83274afb
+Subproject commit e735386b61cdc2bbaed29ba8aa5f28eb18e8b7d9
diff --git a/source/_pages/psr.twig b/source/_pages/psr.twig
@@ -2,7 +2,7 @@
 title: PHP Standards Recommendations
 ---
 
-<div class="markdown">
+<div class="markdown psr_index">
     {% set index = include('fig-standards/PSR.md') %}
     {{ index | processLinks | markdown }}
 </div>
diff --git a/source/_psr/psr-0-meta.twig b/source/_psr/psr-0-meta.twig
@@ -0,0 +1,12 @@
+---
+psr_number: psr-0
+permalink: /psr/psr-0/meta
+title: 'PSR-0 Meta Document'
+markdown_source: fig-standards/accepted/PSR-0.md
+related:
+    - { name: 'PSR-0: Autoloading Standard (deprecated)', permalink: /psr/psr-0/ }
+    - { name: 'PSR-4: Autoloading Standard', permalink: /psr/psr-4/ }
+    - { name: 'PSR-0 Meta Document' }
+---
+
+{{ parent() }}
diff --git a/source/_psr/psr-0.twig b/source/_psr/psr-0.twig
@@ -5,6 +5,8 @@ title: 'PSR-0: Autoloading Standard'
 markdown_source: fig-standards/accepted/PSR-0.md
 related:
     - { name: 'PSR-0: Autoloading Standard' }
+    - { name: 'PSR-4: Autoloading Standard', permalink: /psr/psr-4/ }
+    - { name: 'PSR-0 Meta Document', permalink: /psr/psr-0/meta }
 ---
 
 {{ parent() }}
diff --git a/source/_psr/psr-1-basic-coding-standard-meta.twig b/source/_psr/psr-1-basic-coding-standard-meta.twig
@@ -0,0 +1,11 @@
+---
+psr_number: psr-1
+permalink: /psr/psr-1/meta
+title: 'PSR-1 Meta Document'
+markdown_source: fig-standards/accepted/PSR-1-basic-coding-standard-meta.md
+related:
+    - { name: 'PSR-1: Basic Coding Standard', permalink: /psr/psr-1/ }
+    - { name: 'PSR-1 Meta Document' }
+---
+
+{{ parent() }}
diff --git a/source/_psr/psr-1-basic-coding-standard.twig b/source/_psr/psr-1-basic-coding-standard.twig
@@ -5,6 +5,7 @@ title: 'PSR-1: Basic Coding Standard'
 markdown_source: fig-standards/accepted/PSR-1-basic-coding-standard.md
 related:
     - { name: 'PSR-1: Basic Coding Standard' }
+    - { name: 'PSR-1 Meta Document', permalink: /psr/psr-1/meta }
 ---
 
 {{ parent() }}
diff --git a/source/_psr/psr-12-extended-coding-style-meta.twig b/source/_psr/psr-12-extended-coding-style-meta.twig
@@ -5,6 +5,7 @@ title: 'PSR-12: Extended Coding Style'
 markdown_source: fig-standards/accepted/PSR-12-extended-coding-style-guide-meta.md
 related:
     - { name: 'PSR-12: Extended Coding Style', permalink: /psr/psr-12/ }
+    - { name: 'PER Coding Style', permalink: /per/coding-style/ }
     - { name: 'PSR-12 Meta Document' }
 ---
 
diff --git a/source/_psr/psr-12-extended-coding-style.twig b/source/_psr/psr-12-extended-coding-style.twig
@@ -5,6 +5,7 @@ title: 'PSR-12: Extended Coding Style'
 markdown_source: fig-standards/accepted/PSR-12-extended-coding-style-guide.md
 related:
     - { name: 'PSR-12: Extended Coding Style' }
+    - { name: 'PER Coding Style', permalink: /per/coding-style/ }
     - { name: 'PSR-12 Meta Document', permalink: /psr/psr-12/meta }
 ---
 
diff --git a/source/_psr/psr-2-coding-style-guide-meta.twig b/source/_psr/psr-2-coding-style-guide-meta.twig
@@ -5,6 +5,8 @@ title: 'PSR-2 Meta Document'
 markdown_source: fig-standards/accepted/PSR-2-coding-style-guide-meta.md
 related:
     - { name: 'PSR-2: Coding Style Guide', permalink: /psr/psr-2/ }
+    - { name: 'PSR-12: Extended Coding Style', permalink: /psr/psr-12/ }
+    - { name: 'PER Coding Style', permalink: /per/coding-style/ }
     - { name: 'PSR-2 Meta Document' }
 ---
 
diff --git a/source/_psr/psr-2-coding-style-guide.twig b/source/_psr/psr-2-coding-style-guide.twig
@@ -5,6 +5,8 @@ title: 'PSR-2: Coding Style Guide'
 markdown_source: fig-standards/accepted/PSR-2-coding-style-guide.md
 related:
     - { name: 'PSR-2: Coding Style Guide' }
+    - { name: 'PSR-12: Extended Coding Style', permalink: /psr/psr-12/ }
+    - { name: 'PER Coding Style', permalink: /per/coding-style/ }
     - { name: 'PSR-2 Meta Document', permalink: /psr/psr-2/meta }
 ---
 
diff --git a/source/_sass/all.scss b/source/_sass/all.scss
@@ -30,3 +30,4 @@
 @import "blocks/author";
 @import "blocks/sidebar";
 @import "blocks/psr_translation_disclaimer";
+@import "blocks/psr_index";
diff --git a/source/_sass/blocks/psr_index.scss b/source/_sass/blocks/psr_index.scss
@@ -0,0 +1,8 @@
+.psr_index {
+  table tbody tr td:first-of-type {
+    width: 5%;
+  }
+  table tbody tr td:nth-of-type(2)  {
+    min-width: 40%;
+  }
+}
diff --git a/source/index.twig b/source/index.twig
@@ -133,7 +133,6 @@ interface RequestInterface extends MessageInterface
                     <ul class="home_features__links">
                         <li><a class="home_features__link" href="/per/coding-style/">PER Coding Style</a></li>
                         <li><a class="home_features__link" href="/psr/psr-1/">PSR-1: Basic Coding Standard</a></li>
-                        <li><a class="home_features__link" href="/psr/psr-12/">PSR-12: Extended Coding Style Guide</a></li>
                     </ul>
                 </div>
                 <div class="home_features__editor">
