Verified Commit 8c8d84f7 authored by David Beniamine's avatar David Beniamine
Browse files

Put @var phpdoc hint on oneline

Netbeans does not recognize multiles @var phpDoc thus complete badly
parent ff3e7012
......@@ -61,22 +61,16 @@ class ConversationController extends Controller
public function show(Request $request)
{
$user = Auth::User();
/**
* @var string $title
*/
/** @var string $title */
$title = $request->input('title');
/**
* @var string $new_part_ids Participants: list of id_user separated by ","
*/
/** @var string $new_part_ids Participants: list of id_user separated by "," */
$new_part_ids = $request->input('new_part_ids');
/**
* @param int $id_report_context report.id_report if in a report contect OR 0 if in a teacher context
*/
$id_report_context = (int) $request->input('id_report_context');
/**
* @var \App\Conversation $conversation
*/
/** @var \App\Conversation $conversation */
$conversation = Conversation::find((int) $request->input('id_conv'));
$id_report_conv = (int) $request->input('id_report_conv');
......@@ -307,13 +301,9 @@ class ConversationController extends Controller
*/
public function addMessage(Request $request, Conversation $conversation)
{
/**
* @var int $id_report_context used to know if a LD can be SAVED - null if the msg widget is opened in a teacher context
*/
/** @var int $id_report_context used to know if a LD can be SAVED - null if the msg widget is opened in a teacher context */
$id_report_context = $request->input('id_report_context');
/**
* @var string $msgText texte du message : chaine vide si il n'y a pas de nouveau message ou si un labdoc est envoyé
*/
/** @var string $msgText texte du message : chaine vide si il n'y a pas de nouveau message ou si un labdoc est envoyé */
$msgText = $request->input('new_msg');
/**
* @param int $id_ld nouveau LD attache : 0 si il n'y a pas de LD attaché
......
......@@ -15,24 +15,16 @@ use Lcobucci\JWT\ValidationData;
class JWTServer
{
/**
* @var array fields that MUST be in all jwt
*/
/** @var array fields that MUST be in all jwt */
private $requiredFields = ['iss'=>0, 'iat'=>0, 'sub'=>0, 'dest'=>0, 'orig'=>0];
/**
* @var \App\User
*/
/** @var \App\User */
private $user = null;
/**
* @var int
*/
/** @var int */
private $extplatform = null;
/**
* @var int ttl seconds
*/
/** @var int ttl seconds */
private $ttl;
......
......@@ -9,9 +9,7 @@ class Agalan
{
const INSTITUTION_UGA = 2;
/**
* @var array teachers' employeeType
*/
/** @var array teachers' employeeType */
const teachType = [ 'P'];
/**
......
......@@ -6,19 +6,13 @@ use Illuminate\Support\Facades\DB;
class BackupMission
{
/**
* @var int
*/
/** @var int */
private $id;
/**
* @var Backup
*/
/** @var Backup */
private $backupSystem;
/**
* @var string
*/
/** @var string */
private $backupDir;
public function __construct($id)
......
......@@ -7,19 +7,13 @@ use Illuminate\Support\Facades\Log;
class BackupReport
{
/**
* @var int
*/
/** @var int */
private $id;
/**
* @var Backup
*/
/** @var Backup */
private $backupSystem;
/**
* @var string
*/
/** @var string */
private $backupDir;
public function __construct($id)
......
......@@ -28,17 +28,13 @@ class Ldap
protected static $adapter_keys = ['host', 'port', 'encryption'];
/**
* @var array The strings {{INST}} and {{NUM}} will be replaced.
*/
/** @var array The strings {{INST}} and {{NUM}} will be replaced. */
protected $numberPatterns = [
"{{INST}}_apo-{{NUM}}", // e.g. "u123_apo-12345678"
"udg_apo-{{NUM}}", // for Grenoble's PhD students
];
/**
* @var \Symfony\Component\Ldap\Ldap
*/
/** @var \Symfony\Component\Ldap\Ldap */
private $ldap;
protected $error = '';
......
......@@ -4,9 +4,7 @@ namespace App\Processes;
class LdapMasquerade extends Ldap
{
/**
* @var array
*/
/** @var array */
private $users;
/**
......
......@@ -4,61 +4,39 @@ namespace App\Processes;
class LdapUser
{
/**
* @var string unique ID (login)
*/
/** @var string unique ID (login) */
public $uid;
/**
* @var string Full name
*/
/** @var string Full name */
public $cn;
/**
* @var string First name
*/
/** @var string First name */
public $givenName;
/**
* @var string Last name (family)
*/
/** @var string Last name (family) */
public $sn;
public $o;
/**
* @var array Student identifiers (BIPER, APOGEE)
*/
/** @var array Student identifiers (BIPER, APOGEE) */
public $aglnOrganizationUid;
/**
* @var string max status
*/
/** @var string max status */
public $aglnPrimaryOrganizationName;
/**
* @var string max status
*/
/** @var string max status */
public $aglnPersonStatus;
public $employeeType;
public $objectClass;
/**
* @var string Preferred email address
*/
/** @var string Preferred email address */
public $mail;
/**
* @var string nomail | normal | rcopy | rfull | ext
*/
/** @var string nomail | normal | rcopy | rfull | ext */
public $aglnMailStatus;
/**
* @var array
*/
/** @var array */
public $aglnMailEffectiveAddr;
/**
* @var array
*/
/** @var array */
public $aglnMailRedirectAddr;
public function __construct(array $attributes)
......
......@@ -7,95 +7,57 @@ use Illuminate\Support\Facades\Auth;
class Labdoc
{
/**
* @var \App\Labdoc
*/
/** @var \App\Labdoc */
public $ld;
/**
* @var \App\Report
*/
/** @var \App\Report */
public $report;
/**
* @var \App\ReportPart
*/
/** @var \App\ReportPart */
public $reportPart;
/**
* @var \Illuminate\Support\Collection of \App\Labdoc
*/
/** @var \Illuminate\Support\Collection of \App\Labdoc */
public $labdocs;
/**
* @var string
*/
/** @var string */
public $scope;
/**
* @var array
*/
/** @var array */
public $ld_chosen;
/**
* @var string
*/
/** @var string */
public $choice_ld;
/**
* @var bool is the scope "default"
*/
/** @var bool is the scope "default" */
public $is_default;
/**
* @var bool is the scope "pdf"
*/
/** @var bool is the scope "pdf" */
public $is_pdf;
/**
* @var bool is the scope "view"
*/
/** @var bool is the scope "view" */
public $is_view;
/**
* @var bool is the scope "test"
*/
/** @var bool is the scope "test" */
public $is_test;
/**
* @var bool is the scope "follow"
*/
/** @var bool is the scope "follow" */
public $is_follow;
/**
* @var bool is the user a teacher
*/
/** @var bool is the user a teacher */
public $is_teacher;
/**
* @var bool is the user a teacher
*/
/** @var bool is the user a teacher */
public $is_learner;
/**
* @var bool is the report in read only mode
*/
/** @var bool is the report in read only mode */
public $read_only;
/**
* @var array classes for the view
*/
/** @var array classes for the view */
public $classes;
/**
* @var bool
*/
/** @var bool */
public $edition;
/**
* @var bool Should we extend the labdoc
*/
/** @var bool Should we extend the labdoc */
public $extend;
/**
* @var ???|null
*/
/** @var ???|null */
private $ld_status;
/**
......
......@@ -11,116 +11,72 @@ class Report
* Helper class for Report view
*/
/**
* @var \App\Report Report
*/
/** @var \App\Report Report */
public $report;
/**
* @var \App\Mission Report's mission
*/
/** @var \App\Mission Report's mission */
public $mission;
/**
* @var string View scope : default|view|pdf|test|follow
*/
/** @var string View scope : default|view|pdf|test|follow */
public $scope;
/**
* @var bool is the scope "default"
*/
/** @var bool is the scope "default" */
public $is_default;
/**
*/
public $is_pdf;
/**
* @var bool is the scope "pdf"
/**
* @var bool is the scope "view"
*/
/** @var bool is the scope "view" */
public $is_view;
/**
* @var bool is the scope "test"
*/
/** @var bool is the scope "test" */
public $is_test;
/**
* @var bool is the scope "follow"
*/
/** @var bool is the scope "follow" */
public $is_follow;
/**
* @var bool is the report in read only mode
*/
/** @var bool is the report in read only mode */
public $read_only;
/**
* @var bool should we show the message widget
*/
/** @var bool should we show the message widget */
public $widg_msg;
/**
* @var bool is the user a teacher
*/
/** @var bool is the user a teacher */
public $is_teacher;
/**
* @var bool is the user a teacher
*/
/** @var bool is the user a teacher */
public $is_learner;
/**
* @var string usersnames in the group
*/
/** @var string usersnames in the group */
public $users_in_group;
/**
* @var array list of selected labdoc ids
*/
/** @var array list of selected labdoc ids */
public $ld_chosen;
/**
* @var string 'chose_ld'|'no_draft'|'all_ld'|''
*/
/** @var string 'chose_ld'|'no_draft'|'all_ld'|'' */
public $choice_ld;
/**
* @var bool should we print empty report parts
*/
/** @var bool should we print empty report parts */
public $print_empty_rp;
/**
* @var bool should we print assignments
*/
/** @var bool should we print assignments */
public $print_assignment;
/**
* @var bool|null is there an assignment
*/
/** @var bool|null is there an assignment */
public $assignment;
/**
* @var bool
*/
/** @var bool */
public $puppeteer;
/**
* @var string report title
*/
/** @var string report title */
public $title;
/**
* @var string Adress to use for teacher interface
*/
/** @var string Adress to use for teacher interface */
public $teacherAddress;
/**
* @var string Should we add resource in widget resource
*/
/** @var string Should we add resource in widget resource */
public $add_resource;
/**
* @var string filepath for pdf print
*/
/** @var string filepath for pdf print */
public $filepath;
/**
......
......@@ -4,70 +4,42 @@ namespace App\Views;
class ReportPart
{
/**
* @var \App\Report
*/
/** @var \App\Report */
public $report;
/**
* @var \App\ReportPart
*/
/** @var \App\ReportPart */
public $reportPart;
/**
* @var \Illuminate\Support\Collection|\App\Labdoc[]
*/
/** @var \Illuminate\Support\Collection|\App\Labdoc[] */
public $labdocs;
/**
* @var string
*/
/** @var string */
public $scope;
/**
* @var array
*/
/** @var array */
public $ld_chosen;
/**
* @var string
*/
/** @var string */
public $choice_ld;
/**
* @var bool is the scope "default"
*/
/** @var bool is the scope "default" */
public $is_default;
/**
* @var bool is the scope "pdf"
*/
/** @var bool is the scope "pdf" */
public $is_pdf;
/**
* @var bool is the scope "view"
*/
/** @var bool is the scope "view" */
public $is_view;
/**
* @var bool is the scope "test"
*/
/** @var bool is the scope "test" */
public $is_test;
/**
* @var bool is the scope "follow"
*/
/** @var bool is the scope "follow" */
public $is_follow;
/**
* @var bool is the user a teacher
*/
/** @var bool is the user a teacher */
public $is_teacher;
/**
* @var bool is the user a teacher
*/
/** @var bool is the user a teacher */
public $is_learner;
/**
* @var bool is the report in read only mode
*/
/** @var bool is the report in read only mode */
public $read_only;
......
......@@ -6,24 +6,16 @@ use Illuminate\Support\Facades\DB;
class Comment extends Widget
{
/**
* @var int
*/
/** @var int */
public $visible;
/**
* @var mixed
*/
/** @var mixed */
public $div_comment;
/**
* @var string
*/
/** @var string */
public $name;
/**
* @var int
*/
/** @var int */
public $id_report;
/**
......
......@@ -4,19 +4,13 @@ namespace App\Views\Widgets;
class Message extends Widget
{
/**
* @var mixed $div_msg
*/
/** @var mixed $div_msg */
public $div_msg;
/**
* @var boolean $vis
*/
/** @var boolean $vis */
public $vis;
/**
* @var int $id_report
*/
/** @var int $id_report */
public $id_report;
/**
......
......@@ -6,34 +6,22 @@ use Illuminate\Support\Facades\DB;
class Resource extends Widget {
/**
* @var mixed $div_resource
*/
/** @var mixed $div_resource */
public $div_resource;
/**