Revert "Merge pull request #127 from creative-commoners/pulls/master/…

.htaccess

@@ -0,0 +1,59 @@
+<IfModule mod_rewrite.c>
+    SetEnv HTTP_MOD_REWRITE On
+    RewriteEngine On
+
+
+    ### =============== Legacy redirects ===============
+
+    # Packages no longer exist
+    RewriteCond %{REQUEST_URI} ^(.*)en/.*/package-.*\.html [NC]
+    RewriteRule ^(.*)$ %1 [L,R=302]
+
+    # 2.x no longer exists
+    RewriteCond %{REQUEST_URI} ^(.*)en/2[.] [NC]
+    RewriteRule ^(.*)$ %1 [L,R=302]
+
+    # Redirect non-languaged minor versions to major version, e.g. /3.1/DataObject.html to /3/DataObject.html
+    RewriteCond %{REQUEST_URI} ^(.*)(\d)[.]\d/(.*)$ [NC]
+    RewriteRule ^(\d)\.\d/(.*)$ %1%2/%3 [L,R=302]
+
+    # Redirect language minor version to major version, e.g. /en/3.1/File.html to /3/File.html
+    RewriteCond %{REQUEST_URI} ^(.*)en/([\d]+)[.][\w.]+/(.*)$ [NC]
+    RewriteRule ^(.*)$ %1%2/%3 [L,R=302]
+
+    # Class redirect. E.g.
+    # /4/class-SilverStripe.AssetAdmin.Forms.FileSearchFormFactory.html
+    # /4/SilverStripe/AssetAdmin/Forms/FileSearchFormFactory.html
+    RewriteCond %{REQUEST_URI} ^(.*)([\w.]+)/class-([\w]+)\.html [NC]
+    RewriteRule ^(.*)$ %1%2/%3.html [L,R=302]
+    RewriteCond %{REQUEST_URI} ^(.*)([\w.]+)/class-([\w]+)\.([\w]+)\.html [NC]
+    RewriteRule ^(.*)$ %1%2/%3/%4.html [L,R=302]
+    RewriteCond %{REQUEST_URI} ^(.*)([\w.]+)/class-([\w]+)\.([\w]+)\.([\w]+)\.html [NC]
+    RewriteRule ^(.*)$ %1%2/%3/%4/%5.html [L,R=302]
+    RewriteCond %{REQUEST_URI} ^(.*)([\w.]+)/class-([\w]+)\.([\w]+)\.([\w]+)\.([\w]+)\.html [NC]
+    RewriteRule ^(.*)$ %1%2/%3/%4/%5/%6.html [L,R=302]
+    RewriteCond %{REQUEST_URI} ^(.*)([\w.]+)/class-([\w]+)\.([\w]+)\.([\w]+)\.([\w]+)\.([\w]+)\.html [NC]
+    RewriteRule ^(.*)$ %1%2/%3/%4/%5/%6/%7.html [L,R=302]
+    RewriteCond %{REQUEST_URI} ^(.*)([\w.]+)/class-([\w]+)\.([\w]+)\.([\w]+)\.([\w]+)\.([\w]+)\.([\w]+)\.html [NC]
+    RewriteRule ^(.*)$ %1%2/%3/%4/%5/%6/%7/%8.html [L,R=302]
+
+    ### ============= End Legacy redirects =============
+
+    # Lookup script (used to be a SS app, now just a simple script)
+    # E.g. http://api.silverstripe.org.loc/search/lookup/?q=SilverStripe\ORM\HasManyList&version=4&module=framework
+    RewriteCond %{REQUEST_URI} ^(.*)search/lookup [NC]
+    RewriteRule ^/?search/lookup(/|$) %1search/lookup.php [L,R=302,QSA]
+
+    # Symlink to 5 index.html - default major version
+    RewriteCond %{REQUEST_URI} ^(.*)$ [NC]
+    RewriteRule ^/?$ %15/index.html [R=302,L]
+
+    # Serve docs in htdocs
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_URI} .* [NC]
+    RewriteRule ^(.*)$ htdocs/$1
+
+    # 404 handling
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule .* errors/404.html
+</IfModule>

.platform.yml

@@ -0,0 +1,17 @@
+infrastructure: ^3
+php_settings:
+  version: 8.1
+  cli:
+    max_execution_time: 0
+shared_dirs:
+  mysite:
+    data: {}
+    htdocs: {}
+crons:
+  mytask:
+    time: "0 3 * * *"
+    command: "/var/www/mysite/www/makedoc.sh | logger -t SilverStripe_cron"
+    vhost: "mysite"
+url_rules:
+  mysite:
+    - '^.*': 'apache'

browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src="/mstile-70x70.png"/>
+      <square150x150logo src="/mstile-150x150.png"/>
+      <square310x310logo src="/mstile-310x310.png"/>
+      <wide310x150logo src="/mstile-310x150.png"/>
+      <TileColor>#005b94</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>

conf/doctum.json

@@ -8,7 +8,6 @@
         "4": "4.x",
         "3": "3.x"
     },
-    "default_version": "5",
     "paths": {
         "www": "htdocs",
         "cache": "data/cache",

conf/doctum.php

@@ -2,13 +2,13 @@
 
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor\NameResolver;
+use Doctum\Project;
 use Doctum\Doctum;
 use SilverStripe\ApiDocs\Data\ApiJsonStore;
 use SilverStripe\ApiDocs\Data\Config;
 use SilverStripe\ApiDocs\Inspections\RecipeFinder;
 use SilverStripe\ApiDocs\Inspections\RecipeVersionCollection;
 use SilverStripe\ApiDocs\RemoteRepository\SilverStripeRemoteRepository;
-use SilverStripe\ApiDocs\SilverstripeProject;
 
 // Get config
 $config = Config::getConfig();
@@ -70,7 +70,7 @@
 // Override project
 unset($doctum['project']);
 $doctum['project'] = function ($sc) {
-    $project = new SilverstripeProject($sc['store'], $sc['_versions'], array(
+    $project = new Project($sc['store'], $sc['_versions'], array(
         'build_dir' => $sc['build_dir'],
         'cache_dir' => $sc['cache_dir'],
         'remote_repository' => $sc['remote_repository'],
@@ -82,7 +82,6 @@
         'source_dir' => $sc['source_dir'],
         'insert_todos' => $sc['insert_todos'],
         'base_url' => $sc['base_url'],
-        'favicon' => '/favicon.ico',
         'footer_link' => [
             'href' => 'https://github.com/silverstripe/api.silverstripe.org',
             'rel' => 'noreferrer noopener',

errors/404.html

@@ -0,0 +1,24 @@
+<!doctype html>
+<!--[if lt IE 7 ]><html lang="en-GB" class="no-js lte6 lte7 lte8 lte9 lte10"><![endif]-->
+<!--[if IE 7 ]><html lang="en-GB" class="no-js lte7 lte8 lte9 lte10"><![endif]-->
+<!--[if IE 8 ]><html lang="en-GB" class="no-js lte8 lte9 lte10"><![endif]-->
+<!--[if IE 9 ]><html lang="en-GB" class="no-js lte9 lte10"><![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--><html lang="en-GB" class="no-js"><!--<![endif]-->
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>Page not found &raquo; SilverStripe API docs</title>
+    <link rel="stylesheet" type="text/css" href="/errors/error-styles.css">
+</head>
+<body>
+    <div class="gif_holder">
+        <div class="color_overlay">
+        <div class="text_container">
+            <h2>Whoa 404, either we broke something or you had a typing mishap :-/</h2>
+            <h3> Let's go back <a href="/">home.</a></h3>
+        </div>
+    </div>
+</body>
+</html>

static/css/error-styles.css → errors/error-styles.css

@@ -1,5 +1,5 @@
 .gif_holder {
-    background-image: url('/images/page-not-found.gif');
+    background-image: url('https://www.silverstripe.com/themes/ssv3/img/banners/page-not-found.gif'); 
     position: relative;
     z-index: 807;
     -webkit-background-size: cover;
@@ -52,5 +52,5 @@ a:hover {
 
 body {
 	padding: 0;
-	margin: 0;
-}
+	margin: 0;"
+}