Merge branch '2.x-dev' into v2/refactor-search-index-handling

hydephp · Dec 13, 2023 · d438c43 · d438c43
2 parents 49de93d + 9c9969a
commit d438c43
Show file tree

Hide file tree

Showing 18 changed files with 69 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,7 +33,7 @@ HydePHP consists of two primary components, Hyde/Hyde and Hyde/Framework. Develo
 - Support both route keys and identifiers for specifying sidebar order in https://github.com/hydephp/develop/pull/1432
 - Updated sitemap generator to use relative links instead of localhost when missing site URL in https://github.com/hydephp/develop/pull/1479
 
-  
+
 ### Removed
 - Removed unhelpful boilerplate from the `hyde/hyde` `package.json` in https://github.com/hydephp/develop/pull/1436
 

diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
@@ -340,7 +340,7 @@ Simplified, this will then be rendered as follows:
 <a href="https://github.com/hydephp/hyde">GitHub</a>
 ```
 
-#### Automatic navigation menu dropdowns 
+#### Automatic navigation menu dropdowns
 
 HydePHP has a neat feature to automatically place pages in dropdowns based on subdirectories.
 
@@ -358,7 +358,7 @@ Now if you create a page called `_pages/about/contact.md` it will automatically
 
 #### Automatic documentation sidebar grouping
 
-This feature works similarly to the automatic navigation menu dropdowns, but instead place the sidebar items in named groups. 
+This feature works similarly to the automatic navigation menu dropdowns, but instead place the sidebar items in named groups.
 This feature is enabled by default, so you only need to place your pages in subdirectories to have them grouped.
 
 For example: `_docs/getting-started/installation.md` will be placed in a group called "Getting Started".

diff --git a/monorepo/DevTools/src/MonorepoReleaseCommand.php b/monorepo/DevTools/src/MonorepoReleaseCommand.php
@@ -241,32 +241,32 @@ protected function prepareReleaseNotes(): void
         ## [Unreleased] - YYYY-MM-DD
 
         ### About
-        
+
         Keep an Unreleased section at the top to track upcoming changes.
-        
+
         This serves two purposes:
-        
+
         1. People can see what changes they might expect in upcoming releases
         2. At release time, you can move the Unreleased section changes into a new release version section.
-        
+
         ### Added
         - for new features.
-        
+
         ### Changed
         - for changes in existing functionality.
-        
+
         ### Deprecated
         - for soon-to-be removed features.
-        
+
         ### Removed
         - for now removed features.
-        
+
         ### Fixed
         - for any bug fixes.
-        
+
         ### Security
         - in case of vulnerabilities.
-        
+
         MARKDOWN);
 
         $this->line('Done.');

diff --git a/monorepo/HydeStan/vendor/php-console/LICENSE.md b/monorepo/HydeStan/vendor/php-console/LICENSE.md
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/monorepo/scripts/docs/DocGen.php b/monorepo/scripts/docs/DocGen.php
@@ -226,9 +226,9 @@ function documentMethod(ReflectionMethod $method, array &$output, string $class,
 {
     $template = <<<'MARKDOWN'
     #### `{{ $methodName }}()`
-    
+
     {{ $description }}
-    
+
     ```php
     // torchlight! {"lineNumbers": false}
     {{ $signature }}({{ $argList }}): {{ $returnType }}

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -25,7 +25,7 @@
 class ServeCommand extends Command
 {
     /** @var string */
-    protected $signature = 'serve 
+    protected $signature = 'serve
         {--host= : <comment>[default: "localhost"]</comment>}}
         {--port= : <comment>[default: 8080]</comment>}
         {--save-preview= : Should the served page be saved to disk? (Overrides config setting)}

diff --git a/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php b/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php
@@ -144,7 +144,7 @@ public function test_that_a_markdown_file_can_be_created_with_custom_content()
             ---
             title: 'Test Page'
             ---
-            
+
             # Test Page
 
             Hello World!

diff --git a/packages/framework/tests/Feature/LoadYamlConfigurationTest.php b/packages/framework/tests/Feature/LoadYamlConfigurationTest.php
@@ -52,7 +52,7 @@ public function testCanDefineMultipleConfigSettingsInHydeYmlFile()
             name: HydePHP
             url: "http://localhost"
         docs:
-            sidebar: 
+            sidebar:
                 header: "My Docs"
         YAML);
 
@@ -147,7 +147,7 @@ public function testCanAddArbitraryNamespacedData()
 
         $this->file('hyde.yml', <<<'YAML'
         hyde:
-          some: thing 
+          some: thing
         foo:
           bar: baz
         YAML);

diff --git a/packages/framework/tests/Unit/CreatesNewMarkdownPostFileTest.php b/packages/framework/tests/Unit/CreatesNewMarkdownPostFileTest.php
@@ -66,7 +66,7 @@ public function testSave()
         ---
 
         ## Write something awesome.
-        
+
         MARKDOWN, file_get_contents($path));
 
         unlink($path);
@@ -89,7 +89,7 @@ public function testSaveWithCustomContent()
         ---
 
         Hello World!
-        
+
         MARKDOWN, file_get_contents($path));
 
         unlink($path);

diff --git a/packages/hydefront/hyde.scss b/packages/hydefront/hyde.scss
@@ -1,6 +1,6 @@
 /**
  * Core Stylesheet for the HydePHP Frontend
- * 
+ *
  * @package     HydePHP - HydeFront
  * @version     v3.x (HydeFront)
  * @author      Caen De Silva

diff --git a/packages/publications/LICENSE.md b/packages/publications/LICENSE.md
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/packages/publications/tests/Feature/CreatesNewPublicationPageTest.php b/packages/publications/tests/Feature/CreatesNewPublicationPageTest.php
@@ -58,10 +58,10 @@ public function testCreate()
             __createdAt: 2022-01-01T00:00:00+00:00
             title: 'Hello World'
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, file_get_contents(Hyde::path('test-publication/hello-world.md')));
     }
 
@@ -88,10 +88,10 @@ public function testWithTextType()
                 This is a description
                 It can be multiple lines.
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, file_get_contents(Hyde::path('test-publication/2022-01-01-000000.md')));
     }
 
@@ -117,10 +117,10 @@ public function testWithArrayType()
                 - tag2
                 - 'foo bar'
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, file_get_contents(Hyde::path('test-publication/2022-01-01-000000.md')));
     }
 
@@ -155,10 +155,10 @@ public function testCreateWithoutSupplyingRequiredField()
             ---
             __createdAt: 2022-01-01T00:00:00+00:00
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, file_get_contents(Hyde::path('test-publication/2022-01-01-000000.md')));
     }
 
@@ -192,10 +192,10 @@ public function testItCreatesValidYaml()
                 - tag2
                 - 'foo bar'
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, $contents
         );
 

diff --git a/packages/publications/tests/Feature/MakePublicationCommandTest.php b/packages/publications/tests/Feature/MakePublicationCommandTest.php
@@ -192,10 +192,10 @@ public function test_command_with_schema_using_canonical_meta_field()
             ---
             __createdAt: 2022-01-01T00:00:00+00:00
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, file_get_contents(Hyde::path('test-publication/2022-01-01-000000.md')));
     }
 
@@ -419,10 +419,10 @@ public function test_media_input_with_no_files_but_skips()
             ---
             __createdAt: 2022-01-01T00:00:00+00:00
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, $this->getDatedPublicationContents());
     }
 
@@ -510,10 +510,10 @@ public function test_with_skipping_inputs()
             ---
             __createdAt: 2022-01-01T00:00:00+00:00
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, $this->getDatedPublicationContents());
     }
 
@@ -547,10 +547,10 @@ protected function assertPublicationFileWasCreatedCorrectly(): void
             __createdAt: 2022-01-01T00:00:00+00:00
             title: 'Hello World'
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, file_get_contents(Hyde::path('test-publication/hello-world.md'))
         );
     }
@@ -573,10 +573,10 @@ protected function assertCreatedPublicationMatterEquals(string $expected): void
             __createdAt: 2022-01-01T00:00:00+00:00
             $expected
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MARKDOWN, $this->getDatedPublicationContents());
     }
 

diff --git a/packages/publications/tests/Feature/PublicationPageTest.php b/packages/publications/tests/Feature/PublicationPageTest.php
@@ -74,10 +74,10 @@ public function test_publication_pages_are_parsable()
             __createdAt: 2022-11-27 21:07:37
             title: My Title
             ---
-            
+
             ## Write something awesome.
-            
-            
+
+
             MD
         );
 

diff --git a/packages/publications/tests/Feature/PublicationPageValidatorTest.php b/packages/publications/tests/Feature/PublicationPageValidatorTest.php
@@ -28,7 +28,7 @@ public function testValidatePageFile()
             myField: foo
             myNumber: 123
             ---
-            
+
             # My Page
             MD
         );
@@ -52,7 +52,7 @@ public function testValidatePageFileWithInvalidFields()
             ---
             myField: false
             ---
-            
+
             # My Page
             MD
         );
@@ -76,7 +76,7 @@ public function testValidatePageFileWithInvalidDataBuffered()
             ---
             myField: false
             ---
-            
+
             # My Page
             MD
         );
@@ -99,7 +99,7 @@ public function testWarningsWithWarnings()
             ---
             extra: field
             ---
-            
+
             # My Page
             MD
         );

diff --git a/packages/publications/tests/Feature/StaticSiteBuilderPublicationModuleTest.php b/packages/publications/tests/Feature/StaticSiteBuilderPublicationModuleTest.php
@@ -217,7 +217,7 @@ protected function assertThePaginationLinksAreCorrect(): void
             <div class="px-2">
             <strong>1</strong>
             <a href="../test-publication/page-2.html">2</a>                                                <a href="../test-publication/page-3.html">3</a>                        </div>
-            
+
             <a href="../test-publication/page-2.html">&#8250;</a>    </nav>        </div>
             HTML, Filesystem::get('_site/test-publication/page-1.html')
         );
-Original file line number
+Diff line change
@@ Expand Up @@
                 ---
                 title: 'Test Page'
                 ---
                 # Test Page
                 Hello World!
@@ Expand Down @@