Browse Source

php8.1に対応できるよう、enum内のconst宣言を廃止

develop
sosuke.iwabuchi 2 years ago
parent
commit
84ecb0de8c
12 changed files with 24 additions and 12 deletions
  1. +1
    -3
      app/Models/Feature/ContractFeature.php
  2. +1
    -3
      app/Models/Feature/ReceiptIssuingOrderFeature.php
  3. +1
    -3
      app/Models/Feature/SMSProviderFeature.php
  4. +1
    -3
      app/Models/Feature/SMSSendOrderFeature.php
  5. +2
    -0
      app/Models/ReceiptIssuingHTParkingCustomOrder.php
  6. +2
    -0
      app/Models/ReceiptIssuingOrder.php
  7. +3
    -0
      app/Models/ReceiptIssuingOrderTax.php
  8. +3
    -0
      app/Models/SMSProviderFourSMessageCommunication.php
  9. +4
    -0
      app/Models/SMSSendOrder.php
  10. +2
    -0
      app/Models/UseByKeySummary.php
  11. +2
    -0
      app/Models/UseSummary.php
  12. +2
    -0
      app/Models/User.php

+ 1
- 3
app/Models/Feature/ContractFeature.php View File

@@ -10,12 +10,10 @@ use LogicException;


trait ContractFeature trait ContractFeature
{ {
const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID;

public function setContract(Contract|string $contract): static public function setContract(Contract|string $contract): static
{ {
$id = is_string($contract) ? $contract : $contract->id; $id = is_string($contract) ? $contract : $contract->id;
data_set($this, self::COL_NAME_CONTRACT_ID, $id);
data_set($this, ColumnName::CONTRACT_ID, $id);
return $this; return $this;
} }




+ 1
- 3
app/Models/Feature/ReceiptIssuingOrderFeature.php View File

@@ -10,12 +10,10 @@ use LogicException;


trait ReceiptIssuingOrderFeature trait ReceiptIssuingOrderFeature
{ {
const COL_NAME_RECEIPT_ISSUING_ORDER_ID = ColumnName::RECEIPT_ISSUING_ORDER_ID;

public function setReceiptIssuingOrder(ReceiptIssuingOrder|string $receiptIssuingOrder): static public function setReceiptIssuingOrder(ReceiptIssuingOrder|string $receiptIssuingOrder): static
{ {
$id = is_string($receiptIssuingOrder) ? $receiptIssuingOrder : $receiptIssuingOrder->id; $id = is_string($receiptIssuingOrder) ? $receiptIssuingOrder : $receiptIssuingOrder->id;
data_set($this, self::COL_NAME_RECEIPT_ISSUING_ORDER_ID, $id);
data_set($this, ColumnName::RECEIPT_ISSUING_ORDER_ID, $id);
return $this; return $this;
} }




+ 1
- 3
app/Models/Feature/SMSProviderFeature.php View File

@@ -10,12 +10,10 @@ use LogicException;


trait SMSProviderFeature trait SMSProviderFeature
{ {
const COL_NAME_SMS_PROVIDER_ID = ColumnName::SMS_PROVIDER_ID;

public function setSMSProvider(SMSProvider|string $smsProvider): static public function setSMSProvider(SMSProvider|string $smsProvider): static
{ {
$id = is_string($smsProvider) ? $smsProvider : $smsProvider->id; $id = is_string($smsProvider) ? $smsProvider : $smsProvider->id;
data_set($this, self::COL_NAME_SMS_PROVIDER_ID, $id);
data_set($this, ColumnName::SMS_PROVIDER_ID, $id);
return $this; return $this;
} }




+ 1
- 3
app/Models/Feature/SMSSendOrderFeature.php View File

@@ -10,12 +10,10 @@ use LogicException;


trait SMSSendOrderFeature trait SMSSendOrderFeature
{ {
const COL_NAME_SMS_SEND_ORDER_ID = ColumnName::SMS_SEND_ORDER_ID;

public function setSMSSendOrder(SMSSendOrder|string $smsSendOrder) public function setSMSSendOrder(SMSSendOrder|string $smsSendOrder)
{ {
$id = is_string($smsSendOrder) ? $smsSendOrder : $smsSendOrder->id; $id = is_string($smsSendOrder) ? $smsSendOrder : $smsSendOrder->id;
data_set($this, self::COL_NAME_SMS_SEND_ORDER_ID, $id);
data_set($this, ColumnName::SMS_SEND_ORDER_ID, $id);
} }


public function smsSendOrder(): BelongsTo public function smsSendOrder(): BelongsTo


+ 2
- 0
app/Models/ReceiptIssuingHTParkingCustomOrder.php View File

@@ -8,6 +8,8 @@ class ReceiptIssuingHTParkingCustomOrder extends AppModel
{ {
use ReceiptIssuingOrderFeature; use ReceiptIssuingOrderFeature;


const COL_NAME_RECEIPT_ISSUING_ORDER_ID = ColumnName::RECEIPT_ISSUING_ORDER_ID;

const COL_NAME_CUSTOMER_CODE = "customer_code"; const COL_NAME_CUSTOMER_CODE = "customer_code";
const COL_NAME_PARKING_MANAGEMENT_CODE = "parking_management_code"; const COL_NAME_PARKING_MANAGEMENT_CODE = "parking_management_code";
const COL_NAME_ADJUST_SEQ_NO = "adjust_seq_no"; const COL_NAME_ADJUST_SEQ_NO = "adjust_seq_no";


+ 2
- 0
app/Models/ReceiptIssuingOrder.php View File

@@ -11,6 +11,8 @@ class ReceiptIssuingOrder extends AppModel
{ {
use ContractFeature; use ContractFeature;


const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID;

const COL_NAME_HANDLER_ID = "handler_id"; const COL_NAME_HANDLER_ID = "handler_id";
const COL_NAME_ORDER_DATETIME = "order_datetime"; const COL_NAME_ORDER_DATETIME = "order_datetime";
const COL_NAME_STATUS_NAME = "status_name"; const COL_NAME_STATUS_NAME = "status_name";


+ 3
- 0
app/Models/ReceiptIssuingOrderTax.php View File

@@ -9,6 +9,9 @@ class ReceiptIssuingOrderTax extends AppModel
{ {
use ContractFeature, ReceiptIssuingOrderFeature; use ContractFeature, ReceiptIssuingOrderFeature;


const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID;
const COL_NAME_RECEIPT_ISSUING_ORDER_ID = ColumnName::RECEIPT_ISSUING_ORDER_ID;

const COL_NAME_TAX_RATE = "tax_rate"; const COL_NAME_TAX_RATE = "tax_rate";
const COL_NAME_TAX_AMOUNT = "tax_amount"; const COL_NAME_TAX_AMOUNT = "tax_amount";




+ 3
- 0
app/Models/SMSProviderFourSMessageCommunication.php View File

@@ -9,6 +9,9 @@ class SMSProviderFourSMessageCommunication extends AppModel
{ {
use ContractFeature, SMSSendOrderFeature; use ContractFeature, SMSSendOrderFeature;


const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID;
const COL_NAME_SMS_SEND_ORDER_ID = ColumnName::SMS_SEND_ORDER_ID;

const COL_NAME_REQUEST_ID = "request_id"; const COL_NAME_REQUEST_ID = "request_id";
const COL_NAME_REQUEST_DATE = "request_date"; const COL_NAME_REQUEST_DATE = "request_date";
const COL_NAME_REQUEST_STATUS = "request_status"; const COL_NAME_REQUEST_STATUS = "request_status";


+ 4
- 0
app/Models/SMSSendOrder.php View File

@@ -12,6 +12,10 @@ class SMSSendOrder extends AppModel
{ {
use ContractFeature, ReceiptIssuingOrderFeature, SMSProviderFeature; use ContractFeature, ReceiptIssuingOrderFeature, SMSProviderFeature;


const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID;
const COL_NAME_RECEIPT_ISSUING_ORDER_ID = ColumnName::RECEIPT_ISSUING_ORDER_ID;
const COL_NAME_SMS_PROVIDER_ID = ColumnName::SMS_PROVIDER_ID;

const COL_NAME_DONE = 'done'; const COL_NAME_DONE = 'done';
const COL_NAME_PORPOSE = 'purpose'; const COL_NAME_PORPOSE = 'purpose';




+ 2
- 0
app/Models/UseByKeySummary.php View File

@@ -8,6 +8,8 @@ class UseByKeySummary extends AppModel
{ {
use ContractFeature; use ContractFeature;


const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID;

const COL_NAME_SUMMARY_YYYYMM = 'summary_yyyymm'; const COL_NAME_SUMMARY_YYYYMM = 'summary_yyyymm';
const COL_NAME_SUMMARY_KEY1 = "summary_key1"; const COL_NAME_SUMMARY_KEY1 = "summary_key1";
const COL_NAME_SUMMARY_KEY2 = "summary_key2"; const COL_NAME_SUMMARY_KEY2 = "summary_key2";


+ 2
- 0
app/Models/UseSummary.php View File

@@ -8,6 +8,8 @@ class UseSummary extends AppModel
{ {
use ContractFeature; use ContractFeature;


const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID;

const COL_NAME_SUMMARY_YYYYMM = 'summary_yyyymm'; const COL_NAME_SUMMARY_YYYYMM = 'summary_yyyymm';
const COL_NAME_RECEIPT_ORDER_COUNT = 'receipt_order_count'; const COL_NAME_RECEIPT_ORDER_COUNT = 'receipt_order_count';
const COL_NAME_SMS_SEND_COUNT = 'sms_send_count'; const COL_NAME_SMS_SEND_COUNT = 'sms_send_count';


+ 2
- 0
app/Models/User.php View File

@@ -27,6 +27,8 @@ class User extends Authenticatable implements IModelFeature
const COL_NAME_NAME = 'name'; const COL_NAME_NAME = 'name';
const COL_NAME_PASSWORD = 'password'; const COL_NAME_PASSWORD = 'password';


const COL_NAME_CONTRACT_ID = ColumnName::CONTRACT_ID;

const COL_NAME_CREATED_BY = ColumnName::CREATED_BY; const COL_NAME_CREATED_BY = ColumnName::CREATED_BY;
const COL_NAME_UPDATED_BY = ColumnName::UPDATED_BY; const COL_NAME_UPDATED_BY = ColumnName::UPDATED_BY;
const COL_NAME_CREATED_AT = ColumnName::CREATED_AT; const COL_NAME_CREATED_AT = ColumnName::CREATED_AT;


Loading…
Cancel
Save