Merge pull request #32 from restoreddev/develop

Small changes in preparation for adding new sections

config.php

@@ -44,116 +44,116 @@ return [
      *
      */
     'pages' => [
-        Page::create('index', 'index.phtml'),
-        Page::create('installing-php', 'installing-php.phtml'),
-        Page::create('credits', 'credits.phtml'),
-        Page::create('404', '404.phtml'),
-        Page::create('basics', null, 'basics.md', [
+        Page::create('index', null, [], 'index.phtml'),
+        Page::create('installing-php', null, [], 'installing-php.phtml'),
+        Page::create('credits', null, [], 'credits.phtml'),
+        Page::create('404', null, [], '404.phtml'),
+        Page::create('basics', 'basics/01-basics.md', [
             'title' => 'Basics',
             'subtitle' => 'Getting started',
             'next' => 'variables',
         ]),
-        Page::create('variables', null, 'variables.md', [
+        Page::create('variables', 'basics/02-variables.md', [
             'title' => 'Variables',
             'subtitle' => 'The building blocks of PHP',
             'previous' => 'basics',
             'next' => 'arithmetic',
         ]),
-        Page::create('arithmetic', null, 'arithmetic.md', [
+        Page::create('arithmetic', 'basics/03-arithmetic.md', [
             'title' => 'Arithmetic',
             'subtitle' => 'Doing math like a pro',
             'previous' => 'variables',
             'next' => 'strings',
         ]),
-        Page::create('strings', null, 'strings.md', [
+        Page::create('strings', 'basics/04-strings.md', [
             'title' => 'Strings',
             'subtitle' => 'Working with text',
             'previous' => 'arithmetic',
             'next' => 'comparisons',
         ]),
-        Page::create('comparisons', null, 'comparisons.md', [
+        Page::create('comparisons', 'basics/05-comparisons.md', [
             'title' => 'Comparisons',
             'subtitle' => 'Equality checking',
             'previous' => 'strings',
             'next' => 'boolean-logic',
         ]),
-        Page::create('boolean-logic', null, 'boolean-logic.md', [
+        Page::create('boolean-logic', 'basics/06-boolean-logic.md', [
             'title' => 'Boolean Logic',
             'subtitle' => 'Is it a yes or a no?',
             'previous' => 'comparisons',
             'next' => 'conditionals',
         ]),
-        Page::create('conditionals', null, 'conditionals.md', [
+        Page::create('conditionals', 'basics/07-conditionals.md', [
             'title' => 'Conditionals',
             'subtitle' => 'Checking the if before the what',
             'previous' => 'boolean-logic',
             'next' => 'loops',
         ]),
-        Page::create('loops', null, 'loops.md', [
+        Page::create('loops', 'basics/08-loops.md', [
             'title' => 'Loops',
             'subtitle' => 'Increase your repetitions',
             'previous' => 'conditionals',
             'next' => 'arrays',
         ]),
-        Page::create('arrays', null, 'arrays.md', [
+        Page::create('arrays', 'basics/09-arrays.md', [
             'title' => 'Arrays',
             'subtitle' => 'Time to make a list',
             'previous' => 'loops',
             'next' => 'functions',
         ]),
-        Page::create('functions', null, 'functions.md', [
+        Page::create('functions', 'basics/10-functions.md', [
             'title' => 'Functions',
             'subtitle' => 'Reusable code',
             'previous' => 'arrays',
             'next' => 'classes',
         ]),
-        Page::create('classes', null, 'classes.md', [
+        Page::create('classes', 'basics/11-classes.md', [
             'title' => 'Classes',
             'subtitle' => 'Object-oriented programming',
             'previous' => 'functions',
             'next' => 'classes-inheritance',
         ]),
-        Page::create('classes-inheritance', null, 'classes-inheritance.md', [
+        Page::create('classes-inheritance', 'basics/12-classes-inheritance.md', [
             'title' => 'Classes: Inheritance',
             'subtitle' => 'Extend your objects',
             'previous' => 'classes',
             'next' => 'classes-visibility',
         ]),
-        Page::create('classes-visibility', null, 'classes-visibility.md', [
+        Page::create('classes-visibility', 'basics/13-classes-visibility.md', [
             'title' => 'Classes: Visibility',
             'subtitle' => 'Privatizing your objects',
             'previous' => 'classes-inheritance',
             'next' => 'classes-constructor',
         ]),
-        Page::create('classes-constructor', null, 'classes-constructor.md', [
+        Page::create('classes-constructor', 'basics/14-classes-constructor.md', [
             'title' => 'Classes: Constructor',
             'subtitle' => 'Construct your objects',
             'previous' => 'classes-visibility',
             'next' => 'static',
         ]),
-        Page::create('static', null, 'static.md', [
+        Page::create('static', 'basics/15-static.md', [
             'title' => 'Static',
             'subtitle' => 'Class properties and methods',
             'previous' => 'classes-constructor',
             'next' => 'interfaces',
         ]),
-        Page::create('interfaces', null, 'interfaces.md', [
+        Page::create('interfaces', 'basics/16-interfaces.md', [
             'title' => 'Interfaces',
             'subtitle' => 'Writing code contracts',
             'previous' => 'static',
             'next' => 'abstract',
         ]),
-        Page::create('abstract', null, 'abstract.md', [
+        Page::create('abstract', 'basics/17-abstract.md', [
             'title' => 'Abstract Classes',
             'subtitle' => 'Inheriting an interface',
             'previous' => 'interfaces',
             'next' => 'exceptions',
         ]),
-        Page::create('exceptions', null, 'exceptions.md', [
+        Page::create('exceptions', 'basics/18-exceptions.md', [
             'title' => 'Exceptions',
             'subtitle' => 'Throwing errors',
             'previous' => 'abstract',
-            'next' => '',
+            'next' => 'web-http',
         ]),
     ],
 ];

src/Page.php

@@ -47,14 +47,14 @@ class Page
      */
     public function __construct(
         string $name,
-        ?string $template = null,
         ?string $chapter = null,
-        ?array $variables = []
+        ?array $variables = [],
+        ?string $template = null
     ) {
         $this->name = $name;
-        $this->template = $template;
         $this->chapter = $chapter;
         $this->variables = $variables;
+        $this->template = $template;
     }
 
     /**
@@ -68,10 +68,10 @@ class Page
      */
     public static function create(
         string $name,
-        ?string $template = null,
         ?string $chapter = null,
-        ?array $variables = []
+        ?array $variables = [],
+        ?string $template = null
     ): Page {
-        return new static($name, $template, $chapter, $variables);
+        return new static($name, $chapter, $variables, $template);
     }
 }

test/static/config.php

@@ -9,8 +9,8 @@ return [
     'output_dir' => '/tmp/apprentice_output',
     'files_dir' => __DIR__ . '/files',
     'pages' => [
-        Page::create('index', 'index.phtml'),
-        Page::create('test', null, 'test.md', [
+        Page::create('index', null, [], 'index.phtml'),
+        Page::create('test', 'test.md', [
             'title' => 'Test Title',
             'subtitle' => 'Test Subtitle',
             'description' => 'Test Description',