From 6f175b5c7575e89b01d7b7cb3e07007ed2bc3894 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 20:11:45 -0700
Subject: [PATCH] Rename 'route' to 'server_route'

---
 ext/afform/CRM/Afform/AfformScanner.php | 4 ++--
 ext/afform/README.md                    | 2 +-
 ext/afform/afform.php                   | 2 +-
 ext/afform/api/v3/Afform/Get.php        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/afform/CRM/Afform/AfformScanner.php b/ext/afform/CRM/Afform/AfformScanner.php
index d15cc855d7..b6bf50a4c8 100644
--- a/ext/afform/CRM/Afform/AfformScanner.php
+++ b/ext/afform/CRM/Afform/AfformScanner.php
@@ -108,11 +108,11 @@ class CRM_Afform_AfformScanner {
    * @param string $name
    *   Ex: 'view-individual'
    * @return array
-   *   An array with some mix of the following keys: name, title, description, route, requires
+   *   An array with some mix of the following keys: name, title, description, client_route, server_route, requires
    *   Ex: [
    *     'name' => 'view-individual',
    *     'title' => 'View an individual contact',
-   *     'route' => 'civicrm/view-individual',
+   *     'server_route' => 'civicrm/view-individual',
    *     'requires' => ['afform'],
    *   ]
    */
diff --git a/ext/afform/README.md b/ext/afform/README.md
index 8ddd872dca..9ddd4b3b2a 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -44,7 +44,7 @@ this example, we create a form named `foobar`:
 ```
 $ cd /path/to/my/own/extension
 $ mkdir -p afform/foobar
-$ echo '{"route": "civicrm/foobar"}' > afform/foobar/meta.json
+$ echo '{"server_route": "civicrm/foobar"}' > afform/foobar/meta.json
 $ echo '<div>Hello {{param.name}}</div>' > afform/foobar/layout.html
 $ cv flush
 $ cv url civicrm/foobar?name=world
diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index 5eaaa6ca13..084a2cd3cf 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -4,7 +4,7 @@ require_once 'afform.civix.php';
 use CRM_Afform_ExtensionUtil as E;
 
 function _afform_fields() {
-  return ['name', 'title', 'description', 'requires', 'layout'];
+  return ['name', 'title', 'description', 'requires', 'layout', 'server_route', 'client_route'];
 }
 
 /**
diff --git a/ext/afform/api/v3/Afform/Get.php b/ext/afform/api/v3/Afform/Get.php
index a8702e0d17..b4b3e9a398 100644
--- a/ext/afform/api/v3/Afform/Get.php
+++ b/ext/afform/api/v3/Afform/Get.php
@@ -26,7 +26,7 @@ function _civicrm_api3_afform_get_spec(&$spec) {
     'description' => 'Description',
   );
 
-  // FIXME: title, requires, layout
+  // FIXME: title, requires, layout, server_route, client_route
 }
 
 /**
-- 
2.25.1