diff --git a/docs/en/00_Getting_Started/04_Directory_Structure.md b/docs/en/00_Getting_Started/04_Directory_Structure.md index 22f385523..8375cd4c1 100644 --- a/docs/en/00_Getting_Started/04_Directory_Structure.md +++ b/docs/en/00_Getting_Started/04_Directory_Structure.md @@ -4,13 +4,13 @@ The directory-structure in SilverStripe it built on "convention over configuration", so the placement of some files and directories is meaningful to its logic. - + ## Core Structure Directory | Description --------- | ----------- `assets/` | Contains images and other files uploaded via the SilverStripe CMS. You can also place your own content inside it, and link to it from within the content area of the CMS. -`cms/` | Contains all the files that form the CMS area of your site. It’s structure is similar to the mysite/ directory, so if you find something interesting, it should be easy enough to look inside and see how it was built. +`cms/` | Contains all the files that form the CMS area of your site. It’s structure is similar to the mysite/ directory, so if you find something interesting, it should be easy enough to look inside and see how it was built. `framework/` | The framework that builds both your own site and as the CMS that powers it. You’ll be utilising files in this directory often, both directly and indirectly. ## Custom Code Structure @@ -18,20 +18,24 @@ Directory | Description We're using `` as an example - arbitrary directory-names are allowed, as long as they don't collide with existing modules or the directories lists in "Core Structure". - | Directory | Description | - | --------- | ----------- | - | `/` | This directory contains all of your code that defines your website. | - | `/_config` | YAML configuration specific to your application | - | `/code` | PHP code for model and controller (subdirectories are optional) | - | `/templates` | HTML [templates](/developer_guides/templates) with *.ss-extension | - | `/css ` | CSS files | - | `/images ` | Images used in the HTML templates | - | `/javascript` | Javascript and other script files + | Directory | Description | + | --------- | ----------- | + | `/` | This directory contains all of your code that defines your website. | + | `/_config` | YAML configuration specific to your application | + | `/code` | PHP code for model and controller (subdirectories are optional) | + | `/templates` | HTML [templates](/developer_guides/templates) with *.ss-extension | + | `/css ` | CSS files | + | `/images ` | Images used in the HTML templates | + | `/javascript` | Javascript and other script files | + | `/client` | More complex projects can alternatively contain frontend assets in a common `client` folder | + +Check our [JavaScript Coding Conventions](javascript_coding_conventions) for more details +on folder and file naming in SilverStripe core modules. ## Themes Structure | `themes/simple/` | Standard "simple" theme | - | ------------------ | --------------------------- | + | ------------------ | --------------------------- | | `themes/yourtheme/` | The themes folder can contain more than one theme - here's your own | @@ -44,11 +48,11 @@ They should follow the same conventions as posed in "Custom Site Structure" Example Forum: - | Directory | Description | - | --------- | ----------- | - | `forum/` | This directory contains all of your code that defines your website. | - | `forum/code` | PHP code for model and controller (subdirectories are optional) | - | ... | ... | + | Directory | Description | + | --------- | ----------- | + | `forum/` | This directory contains all of your code that defines your website. | + | `forum/code` | PHP code for model and controller (subdirectories are optional) | + | ... | ... | ![](../_images/modules_folder.jpg) @@ -59,18 +63,18 @@ plain text files inside a 'docs' folder located in the module folder. These file can be written with the Markdown syntax (See [Contributing Documentation](/contributing/documentation)) and include media such as images or videos. -Inside the docs folder, developers should organise the markdown files into each -separate language they wish to write documentation for (usually just `en`). Inside -each languages' subfolder, developers then have freedom to create whatever structure +Inside the docs folder, developers should organise the markdown files into each +separate language they wish to write documentation for (usually just `en`). Inside +each languages' subfolder, developers then have freedom to create whatever structure they wish for organising the documentation they wish. Example Forum Documentation: - | Directory | Description | - | --------- | ----------- | - | `forum/docs` | The docs folder will be picked up by the documentation viewer. | + | Directory | Description | + | --------- | ----------- | + | `forum/docs` | The docs folder will be picked up by the documentation viewer. | | `forum/docs/_manifest_exclude` | Empty file to signify that SilverStripe does not need to load classes from this folder | - | `forum/docs/en/` | English documentation | + | `forum/docs/en/` | English documentation | | `forum/docs/en/index.md` | Documentation homepage. Should provide an introduction and links to remaining docs | | `forum/docs/en/Getting_Started.md` | Documentation page. Naming convention is Uppercase and underscores. | | `forum/docs/en//_images/` | Folder to store any images or media | diff --git a/docs/en/00_Getting_Started/05_Coding_Conventions.md b/docs/en/00_Getting_Started/05_Coding_Conventions.md index e34f813fa..13d962c66 100644 --- a/docs/en/00_Getting_Started/05_Coding_Conventions.md +++ b/docs/en/00_Getting_Started/05_Coding_Conventions.md @@ -1,8 +1,8 @@ -# Coding Conventions +# PHP Coding Conventions This document provides guidelines for code formatting and documentation to developers contributing to SilverStripe. It applies to all PHP files -in the framework/ and cms/ modules, as well as any supported additional modules. +in the `framework/` and `cms/` modules, as well as any supported additional modules. Coding standards are an important aspect for every software project, and facilitate collaboration by making code more consistent and readable. @@ -18,16 +18,16 @@ Always use hard tabs rather then spaces for indentation, with one tab per nestin ### Maximum Line Length The target line length is 100 columns with tabs being treated as four columns, -meaning developers should strive keep each line of their code -under 80 columns where possible and practical. -However, longer lines are acceptable in some circumstances. +meaning developers should strive keep each line of their code +under 80 columns where possible and practical. +However, longer lines are acceptable in some circumstances. The maximum length of any line of PHP code is 120 columns. ### Line Termination -Line termination follows the Unix text file convention. Lines must end with a single linefeed (LF) character. +Line termination follows the Unix text file convention. Lines must end with a single linefeed (LF) character. Linefeed characters are represented as ordinal 10, or hexadecimal 0x0A. -Note: Do not use carriage returns (CR) as is the convention in Apple OS's (0x0D) or the carriage return - +Note: Do not use carriage returns (CR) as is the convention in Apple OS's (0x0D) or the carriage return - linefeed combination (CRLF) as is standard for the Windows OS (0x0D, 0x0A). ## Naming Conventions @@ -41,8 +41,8 @@ Class and filenames are in `UpperCamelCase` format: :::php class MyClass {} -If a class name is comprised of more than one word, the first letter of each -new word must be capitalized. Successive capitalized letters are used in +If a class name is comprised of more than one word, the first letter of each +new word must be capitalized. Successive capitalized letters are used in acronyms, e.g. a class `XMLImporter` is used while `XmlImporter` is not. ### Methods @@ -87,15 +87,15 @@ Member variables always declare their visibility by using one of the private, pr ### Constants -All letters used in a constant name must be capitalized, +All letters used in a constant name must be capitalized, while all words in a constant name must be separated by underscore characters. :::php const INTEREST_RATE = 0.19; - + define('INTEREST_RATE', 0.19); -Constants must be defined as class members with the `const` modifier. +Constants must be defined as class members with the `const` modifier. Defining constants in the global scope with the `define` function is permitted but strongly discouraged. ### File Naming and Directory Structure @@ -108,14 +108,14 @@ Example: `mysite/code/MyClass.php` :::php 'firstValue', 'secondKey' => 'secondValue'); -Alternately, the initial array item may begin on the following line. -If so, it should be padded at one indentation level greater than the line containing the array declaration, -and all successive lines should have the same indentation; the closing paren should be on a line by itself at the -same indentation level as the line containing the array declaration. +Alternately, the initial array item may begin on the following line. +If so, it should be padded at one indentation level greater than the line containing the array declaration, +and all successive lines should have the same indentation; the closing paren should be on a line by itself at the +same indentation level as the line containing the array declaration. For readability, the various "=>" assignment operators should be padded such that they align. :::php @@ -246,7 +246,7 @@ before or after the opening parathesis, as well as no space before the closing p public function foo($arg1, $arg2) {} // good public function foo ( $arg1, $arg2 ) {} // bad -Keep the opening brace on the same line as the statement. +Keep the opening brace on the same line as the statement. :::php // good @@ -255,16 +255,16 @@ Keep the opening brace on the same line as the statement. } // bad - public function bar() + public function bar() { // ... } -In cases where the argument list exceeds the maximum line length, you may introduce line breaks. -Additional arguments to the function or method must be indented one additional level beyond the function or method declaration. -A line break should then occur before the closing argument paren, -which should then be placed on the same line as the opening brace of the function -or method with one space separating the two, and at the same indentation level as the function or method declaration. +In cases where the argument list exceeds the maximum line length, you may introduce line breaks. +Additional arguments to the function or method must be indented one additional level beyond the function or method declaration. +A line break should then occur before the closing argument paren, +which should then be placed on the same line as the opening brace of the function +or method with one space separating the two, and at the same indentation level as the function or method declaration. :::php public function bar($arg1, $arg2, $arg3, @@ -283,7 +283,7 @@ apart from the last argument. No control structure is allowed to have spaces directly before or after the opening parenthesis, as well as no space before the closing parenthesis. -The opening brace and closing brace are written on the same line as the conditional statement. +The opening brace and closing brace are written on the same line as the conditional statement. Any content within the braces must be indented using a tab. :::php @@ -291,10 +291,10 @@ Any content within the braces must be indented using a tab. $a = 2; } -If the conditional statement causes the line length to exceed the maximum line length and has several clauses, -you may break the conditional into multiple lines. In such a case, break the line prior to a logic operator, -and pad the line such that it aligns under the first character of the conditional clause. -The closing paren in the conditional will then be placed on a line with the opening brace, +If the conditional statement causes the line length to exceed the maximum line length and has several clauses, +you may break the conditional into multiple lines. In such a case, break the line prior to a logic operator, +and pad the line such that it aligns under the first character of the conditional clause. +The closing paren in the conditional will then be placed on a line with the opening brace, with one space separating the two, at an indentation level equivalent to the opening control statement. :::php @@ -305,9 +305,9 @@ with one space separating the two, at an indentation level equivalent to the ope $a = $d; } -The intention of this latter declaration format is to prevent issues when adding or removing clauses -from the conditional during later revisions. For `if` statements that include `elseif` or `else`, -the formatting conventions are similar to the `if` construct. +The intention of this latter declaration format is to prevent issues when adding or removing clauses +from the conditional during later revisions. For `if` statements that include `elseif` or `else`, +the formatting conventions are similar to the `if` construct. The following examples demonstrate proper formatting for `if` statements with `else` and/or `elseif` constructs: :::php @@ -324,14 +324,14 @@ Statements with `if` can be written without braces on a single line as the block :::php // good if($a == $b) doThis(); - + // bad if($a == $b) doThis(); else doThat(); #### switch -All content within the "switch" statement must be indented using tabs. +All content within the "switch" statement must be indented using tabs. Content under each "case" statement must be indented using an additional tab. :::php @@ -357,9 +357,9 @@ Try to avoid using PHP's ability to mix HTML into the code. :::php // PHP code public function getTitle() { - return "

Bad Example

"; + return "

Bad Example

"; } - + // Template code $Title @@ -370,7 +370,7 @@ Better: Keep HTML in template files: public function getTitle() { return "Better Example"; } - + // Template code

$Title

@@ -381,7 +381,7 @@ and [tag overview](http://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumen * All class definitions and PHP files should have `@package` and `@subpackage`. * Methods should include at least `@param` and `@return`. - * Include a blank line after the description. + * Include a blank line after the description. * Use `{@link MyOtherClass}` and `{@link MyOtherClass->otherMethod}` for inline references. * Denote preformatted code examples in `` blocks. * Always start block-level comments containing phpdoc with two asterisks (`/** ... */`). @@ -389,32 +389,32 @@ and [tag overview](http://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumen Example: :::php - /** + /** * My short description for this class. * My longer description with * multiple lines and richer formatting. - * + * * Usage: * * $c = new MyClass(); * $c->myMethod(); * - * + * * @package custom */ class MyClass extends Class { - + /** * My Method. * This method returns something cool. {@link MyParentMethod} has other cool stuff in it. - * + * * @param string $colour The colour of cool things that you want * @return DataList A list of everything cool */ public function myMethod($foo) {} - + } - + ### Class Member Ordering Put code into the classes in the following order (where applicable). @@ -431,7 +431,7 @@ Put code into the classes in the following order (where applicable). ### SQL Format -If you have to use raw SQL, make sure your code works across databases. Make sure you escape your queries like below, +If you have to use raw SQL, make sure your code works across databases. Make sure you escape your queries like below, with the column or table name escaped with double quotes as below. :::php @@ -447,7 +447,7 @@ are single quoted. Use [ANSI SQL](http://en.wikipedia.org/wiki/SQL#Standardization) format where possible. -### Secure Development +### Secure Development See [security](/developer_guides/security) for conventions related to handing security permissions. @@ -458,4 +458,5 @@ which are licensed under BSD (see [license](http://framework.zend.com/license)). ## Related + * [JavaScript Coding Conventions](/getting_started/javascript_coding_conventions) * [Reference: CMS Architecture](/developer_guides/customising_the_admin_interface/cms_architecture) diff --git a/docs/en/00_Getting_Started/06_JavaScript_Coding_Conventions.md b/docs/en/00_Getting_Started/06_JavaScript_Coding_Conventions.md new file mode 100644 index 000000000..75417b5aa --- /dev/null +++ b/docs/en/00_Getting_Started/06_JavaScript_Coding_Conventions.md @@ -0,0 +1,41 @@ +# JavaScript Coding Conventions + +## Overview + +This document provides guidelines for code formatting to developers contributing +to SilverStripe. It applies to all JavaScript files in the `framework/` and `cms/` modules. + +In 2016, SilverStripe started a rewrite of its CMS interface in +[ES6](https://en.wikipedia.org/wiki/ECMAScript) and +[ReactJS](http://facebook.github.io/react/). Code written prior to this rewrite +might not follow these conventions, and is placed in a `legacy/` folder structure. + +## Conventions + +We follow the [AirBnB JavaScript Conventions](https://github.com/airbnb/javascript). +A lot of their rules can be validated via [ESLint](http://eslint.org/), +and can be checked locally via `npm run lint`. + +## File and Folder Naming + +- All frontend files (CSS, JavaScript, images) should be placed in + a `client/` folder on the top level of the module +- Frontend files relating to the `framework` CMS UI should be placed in `admin/client` +- File names should follow the [AirBnB Naming Conventions](https://github.com/airbnb/javascript#naming-conventions) +- The `client/src/components` folder should contain only React + [presentational components](https://medium.com/@dan_abramov/smart-and-dumb-components-7ca2f9a7c7d0#.r635clean). + These components should be self-contained, and shouldn't know about Redux state. +- The `client/src/containers` folder should contain only React + [container components](https://medium.com/@dan_abramov/smart-and-dumb-components-7ca2f9a7c7d0#.r635clean) +- React classes in `client/src/components` and `client/src/containers` should + have one folder per component, alongside a `README.md` and SCSS files where applicable. +- The `client/src/state` folder should contain [Redux](http://redux.js.org/) + actions, action types and reducers. Each set of these should be kept in a folder + named the same as its [reducer state key](http://redux.js.org/docs/basics/Reducers.html). +- JavaScript tests should be named after the module/class they're testing, + with their file name suffixed with `-tests.js`. +- JavaScript tests should be placed in a `tests/` subfolder alongside the module code. + +## Related + +* [PHP Coding Conventions](/getting_started/coding_conventions)